diff options
| -rwxr-xr-x | test/vcpe/cleanvGMUX.py | 6 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json | 8 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json | 16 | ||||
| -rwxr-xr-x | test/vcpe/soutils.py | 2 |
4 files changed, 25 insertions, 7 deletions
diff --git a/test/vcpe/cleanvGMUX.py b/test/vcpe/cleanvGMUX.py index 29f35ae52..8b2751f45 100755 --- a/test/vcpe/cleanvGMUX.py +++ b/test/vcpe/cleanvGMUX.py @@ -7,12 +7,12 @@ import json from datetime import datetime import time -gmux_ip = '10.12.6.115' +gmux_ip = '' logging.basicConfig(level=logging.DEBUG, format='%(message)s') logger = logging.getLogger('') headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} auth = 'admin', 'admin' -base_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'.format(gmux_ip) +base_url = '' def list_interface(): url = base_url @@ -54,6 +54,8 @@ def delete_interface(interface_name): logger.debug(r) if __name__ == '__main__': + gmux_ip = sys.argv[1] + base_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'.format(gmux_ip) logger.debug('---------------------------------------------------------------') logger.debug('list interfaces before cleaning gmux') list_interface() diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json index b9e7c3dc6..f453aafe2 100644 --- a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json @@ -17,6 +17,14 @@ "vf-module-topology": { "vf-module-parameters": { "param": [ + { + "name": "vcpe_image_name", + "value": "vgw-casa-base-ubuntu-16-04" + }, + { + "name": "vcpe_flavor_name", + "value": "m1.medium" + }, { "name": "public_net_id", "value": "${public_net_id}" diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json index f56e8f431..cda93becc 100644 --- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json @@ -18,6 +18,14 @@ "VNF-API:vnf-assignments": {}, "VNF-API:vnf-parameters": [ { + "vnf-parameter-name": "vcpe_image_name", + "vnf-parameter-value": "vgw-casa-base-ubuntu-16-04" + }, + { + "vnf-parameter-name": "vcpe_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { "vnf-parameter-name": "public_net_id", "vnf-parameter-value": "${public_net_id}" }, @@ -47,15 +55,15 @@ }, { "vnf-parameter-name": "vgw_private_ip_0", - "vnf-parameter-value": "10.5.0.116" + "vnf-parameter-value": "10.5.0.125" }, { "vnf-parameter-name": "vgw_private_ip_1", - "vnf-parameter-value": "10.0.101.116" + "vnf-parameter-value": "10.0.101.125" }, { "vnf-parameter-name": "vgw_private_ip_2", - "vnf-parameter-value": "10.2.0.31" + "vnf-parameter-value": "10.2.0.40" }, { "vnf-parameter-name": "vgw_name_0", @@ -67,7 +75,7 @@ }, { "vnf-parameter-name": "vg_vgmux_tunnel_vni", - "vnf-parameter-value": "116" + "vnf-parameter-value": "125" }, { "vnf-parameter-name": "onap_private_net_id", diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index 6d6a27ef0..6cddd6d08 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -217,7 +217,7 @@ class SoUtils: # create service instance_name = '_'.join([self.vcpecommon.instance_name_prefix['service'], - parser.svc_model['modelName'], name_suffix]) + parser.svc_model['modelName'][0:10], name_suffix]) instance_name = instance_name.lower() req = self.generate_custom_service_request(instance_name, parser.svc_model, brg_mac) self.logger.info(json.dumps(req, indent=2, sort_keys=True)) |