diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-11-26 12:32:55 +0100 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2019-12-06 10:22:10 +0000 |
| commit | ed83db3c55c10fe6f36fd217a42c2fba595d9140 (patch) | |
| tree | 4fb79218a751f7568b77b272b2db700e72313d03 /test/vcpe/soutils.py | |
| parent | 4cc691d7bbf275798211d08e1bc41672c15ad7d3 (diff) | |
Get VfModuleModelInvariantUuid from service csar at runtime
VfModuleModelInvariantUuid no longer needs manual
assignment, it will be gathered from service csar
at runtime.
Change-Id: I5d0da822dd4ce7b574dae8ce80db2a2d1e5de297
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Issue-ID: INT-1389
Diffstat (limited to 'test/vcpe/soutils.py')
| -rwxr-xr-x | test/vcpe/soutils.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index 627d74b6a..8d2e56d12 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -183,10 +183,11 @@ class SoUtils: req_details['owningEntity'] = {'owningEntityId': self.vcpecommon.owning_entity_id, 'owningEntityName': self.vcpecommon.owning_entity_name} - def generate_custom_service_request(self, instance_name, model, brg_mac): + def generate_custom_service_request(self, instance_name, svc_model, + vfmodule_models, brg_mac): brg_mac_enc = brg_mac.replace(':', '-') req_details = { - 'modelInfo': model, + 'modelInfo': svc_model, 'subscriberInfo': {'subscriberName': 'Kaneohe', 'globalSubscriberId': self.vcpecommon.global_subscriber_id}, 'cloudConfiguration': {"lcpCloudRegionId": 'RegionOne', #self.vcpecommon.os_region_name, @@ -201,7 +202,7 @@ class SoUtils: 'name': 'VfModuleNames', 'value': [ { - 'VfModuleModelInvariantUuid': self.vcpecommon.vgw_VfModuleModelInvariantUuid, + 'VfModuleModelInvariantUuid': vfmodule_models[0]['modelInvariantId'], 'VfModuleName': 'VGW2BRG-{0}'.format(brg_mac_enc) } ] @@ -237,7 +238,8 @@ class SoUtils: instance_name = '_'.join([self.vcpecommon.instance_name_prefix['service'], 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) + req = self.generate_custom_service_request(instance_name, parser.svc_model, + parser.vfmodule_models, brg_mac) self.logger.info(json.dumps(req, indent=2, sort_keys=True)) self.logger.info('Creating custom service {0}.'.format(instance_name)) req_id, svc_instance_id = self.submit_create_req(req, 'service') |