diff options
author | Luc Provoost <luc.provoost@intel.com> | 2020-09-30 16:57:30 +0200 |
---|---|---|
committer | Xavier Simonart <xavier.simonart@intel.com> | 2020-10-19 08:50:26 +0000 |
commit | cd690215adb97aee66d355d9bb64a78a55e1defc (patch) | |
tree | dc923a9206051793443270b1d8460ce4f325d037 /VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py | |
parent | f9b0da859a9f2a6556f0437d5cff42a0648dcab2 (diff) |
Support dataplane subnet mask & latency histogram
There is a new parameter in the config_file: dataplane_subnet_mask. This
parameter is added to the dataplane IP addresses and is needed by the
Linux stack to deal with some protocols (e.g. ARP). If not present, the
default value of 24 will be used. In the end, this will make sure that
IP addresses in the rapid.env file will have this mask, e.g. /24
If you use other tools than createrapid.py to create the rapid.env file,
make sure to add the mask.
This commit also introduces a change when exiting: we only copy the
prox.log files from the different prox instances in case we expect a new
prox.log file to be created in these instances.
When using a valid format.yaml file, the tool will now also send the
latency distribution data (histogram) to the URL.
The tool is now also checking the value of bucket_size_exp: it needs to
be 11 or more.
Change-Id: I633cdc64ef687fdb6625be1e7482a5a371f83e93
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py')
-rwxr-xr-x | VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py b/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py index 2e9c6cc2..925fd8bd 100755 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/stackdeployment.py @@ -75,7 +75,7 @@ class StackDeployment(object): for name in server_group_output: self.names.append(name) - def print_paramDict(self, user): + def print_paramDict(self, user, dataplane_subnet_mask): if not(len(self.dp_ips) == len(self.dp_macs) == len(self.mngmt_ips)): sys.exit() _ENV_FILE_DIR = os.path.dirname(os.path.realpath(__file__)) @@ -90,9 +90,11 @@ class StackDeployment(object): env_file.write('admin_ip = {}\n'.format(str(self.mngmt_ips[count]))) if type(self.dp_ips[count]) == list: for i, dp_ip in enumerate(self.dp_ips[count], start = 1): - env_file.write('dp_ip{} = {}\n'.format(i, str(dp_ip))) + env_file.write('dp_ip{} = {}/{}\n'.format(i, str(dp_ip), + dataplane_subnet_mask)) else: - env_file.write('dp_ip1 = {}\n'.format(str(self.dp_ips[count]))) + env_file.write('dp_ip1 = {}/{}\n'.format(str(self.dp_ips[count]), + dataplane_subnet_mask)) if type(self.dp_macs[count]) == list: for i, dp_mac in enumerate(self.dp_macs[count], start = 1): env_file.write('dp_mac{} = {}\n'.format(i, str(dp_mac))) @@ -156,6 +158,6 @@ class StackDeployment(object): self.create_key() self.stack = self.create_stack(stack_name, heat_template, heat_param) - def generate_env_file(self, user = 'centos'): + def generate_env_file(self, user = 'centos', dataplane_subnet_mask = '24'): self.generate_paramDict() - self.print_paramDict(user) + self.print_paramDict(user, dataplane_subnet_mask) |