From 3375ff5646ea9daf944bc7207a19b4db4b44334b Mon Sep 17 00:00:00 2001 From: Ameed Ashour Date: Mon, 16 Jul 2018 20:42:12 +0300 Subject: Allow user to specify subnet cidr on stack create Change-Id: If910ac18f405c98a0e1f48d38d338ad4f61f6004 JIRA: STORPERF-255 Signed-off-by: Ameed Ashour --- docker/storperf-master/storperf/storperf_master.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docker/storperf-master/storperf/storperf_master.py') diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index ff2acce..a50dcc6 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -80,6 +80,7 @@ class StorPerfMaster(object): self._block_sizes = "4096" self._workload_modules = [] self._custom_workloads = [] + self._subnet_CIDR = '172.16.0.0/16' self.slave_info = {} @property @@ -118,6 +119,17 @@ class StorPerfMaster(object): "ERROR: Cannot change volume type after stack is created") self._volume_type = value + @property + def subnet_CIDR(self): + return self._subnet_CIDR + + @subnet_CIDR.setter + def subnet_CIDR(self, value): + if (self.stack_id is not None): + raise ParameterError( + "ERROR: Cannot change subnet CIDR after stack is created") + self._subnet_CIDR = value + @property def agent_count(self): self._get_stack_info() @@ -431,6 +443,7 @@ class StorPerfMaster(object): params['public_network'] = self.public_network params['volume_count'] = self.volume_count params['volume_size'] = self.volume_size + params['subnet_CIDR'] = self.subnet_CIDR params['agent_info'] = json.dumps(self.slave_info) if self.volume_type is not None: params['volume_type'] = self.volume_type @@ -578,6 +591,7 @@ class StorPerfMaster(object): heat_parameters['agent_count'] = self.agent_count heat_parameters['volume_count'] = self.volume_count heat_parameters['volume_size'] = self.volume_size + heat_parameters['subnet_CIDR'] = self.subnet_CIDR if self.volume_type is not None: heat_parameters['volume_type'] = self.volume_type heat_parameters['agent_image'] = self.agent_image -- cgit 1.2.3-korg