NodeInfo::getModel expects the instance-model 19/101019/8
authorIttay Stern <ittay.stern@att.com>
Sun, 2 Feb 2020 16:09:40 +0000 (18:09 +0200)
committerIttay Stern <ittay.stern@att.com>
Mon, 3 Feb 2020 17:32:49 +0000 (19:32 +0200)
Now callers (objectToInstanceTree, objectToModelTree, etc.) pass the hierarchy
itself, instead of providing only the service hierarchy and keys.

Issue-ID: VID-724

Change-Id: I80cde29887d86b2cc986d96b220ff769562f38b8
Signed-off-by: Ittay Stern <ittay.stern@att.com>
31 files changed:
vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts
vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/basic.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/collectionResource/collectionResource.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/collectionResource/collectionResource.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/configuration/configuration.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/configuration/configuration.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/network/network.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/pnf/pnf.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/pnf/pnf.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnfGrouping/vnfGrouping.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnfGrouping/vnfGrouping.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vpn/vpn.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrf.model.info.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrf.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts

index 005babb..693e5f5 100644 (file)
@@ -39,6 +39,7 @@ describe('Retry Page', function () {
       res.vnfs["2017-388_PASQUALE-vPE 0"].action = 'Create';
       res.vnfs["2017-488_PASQUALE-vPE 0"].action = 'Create';
       res.networks["ExtVL 0"].action = 'Create';
+      res.networks["ExtVL 0"].isFailed = true;
       res.networks["ExtVL 0"].statusMessage = 'Network instantiation failed message';
 
       // Adding VFModule with isFailed.
@@ -112,6 +113,7 @@ describe('Retry Page', function () {
       // Adding VFModule with isFailed.
       res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].isFailed = true;
       res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].action = 'Create';
+      res.networks["ExtVL 0"].isFailed = true;
 
       cy.readFile('cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json').then((res) => {
         jsonBuilderAndMock.basicJson(
index 7475c77..2e04f53 100644 (file)
@@ -134,7 +134,13 @@ export class AvailableModelsTreeComponent {
     this.highlightInstances.emit(node.data.modelUniqueId);
     if (FeatureFlagsService.getFlagState(Features.FLAG_1906_COMPONENT_INFO, this.store)) {
       const serviceHierarchy = this._store.getState().service.serviceHierarchy[this.serviceModelId];
-      const model = node.data.getModel(node.data.name, node.data, serviceHierarchy);
+
+      const instanceModel = this._sharedTreeService.modelByIdentifiers(
+        serviceHierarchy, node.data.modelTypeName,
+        this._sharedTreeService.modelUniqueNameOrId(node.data), node.data.name
+      );
+
+      const model = node.data.getModel(instanceModel);
       const modelInfoItems  = node.data.getInfo(model, null);
       const componentInfoModel :ComponentInfoModel = this._sharedTreeService.addGeneralInfoItems(modelInfoItems, node.data.componentInfoType, model, null);
       ComponentInfoService.triggerComponentInfoChange.next(componentInfoModel);
index 4abc203..6a101d3 100644 (file)
@@ -14,6 +14,7 @@ describe('Available Models Tree Service', () => {
   let injector;
   let service: AvailableModelsTreeService;
   let httpMock: HttpTestingController;
+  let sharedTreeService: SharedTreeService;
 
   beforeAll(done => (async () => {
     TestBed.configureTestingModule({
@@ -27,6 +28,7 @@ describe('Available Models Tree Service', () => {
       injector = getTestBed();
       service = injector.get(AvailableModelsTreeService);
       httpMock = injector.get(HttpTestingController);
+      sharedTreeService = injector.get(SharedTreeService);
   })().then(done).catch(done.fail));
 
 
@@ -47,7 +49,6 @@ describe('Available Models Tree Service', () => {
 
 
   describe('#shouldOpenModalDialogOnAddInstance', () => {
-    let serviceHierarchy = getServiceServiceHierarchy();
 
     test('should open popup on add instance', () => {
       // add vnf should return true
@@ -99,6 +100,8 @@ describe('Available Models Tree Service', () => {
       "isEcompGeneratedNaming": false,
       "typeName": "VRF",
       "componentInfoType": "VRF",
+      "data": {
+      },
       "getModel" : ()=>{
         return  {
           min : 1
@@ -108,6 +111,9 @@ describe('Available Models Tree Service', () => {
 
 
     const serviceStore = {
+      "serviceHierarchy": {
+        "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc": {}
+      },
       "serviceInstance": {
         "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc": {
           "action": "Create",
@@ -158,7 +164,7 @@ describe('Available Models Tree Service', () => {
                   "physicalName": "sriovnet0",
                   "instanceId": "46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7",
                   "serviceName": "LPPVPN",
-                  "servยงiceUUID": "VPN1271",
+                  "serviceUUID": "VPN1271",
                   "tenantName": "ecomp_ispt",
                   "lcpCloudRegionId": "USA,EMEA",
                   "modelInfo": {
@@ -221,6 +227,8 @@ describe('Available Models Tree Service', () => {
       }
     };
 
+    spyOn(sharedTreeService, 'modelByIdentifiers').and.returnValue({});
+
     const serviceModelId :string = '4117a0b6-e234-467d-b5b9-fe2f68c8b0fc';
 
     let result: boolean = service.shouldOpenVRFModal(nodes,  serviceModelId, serviceStore);
@@ -235,344 +243,4 @@ describe('Available Models Tree Service', () => {
 
   });
 
-  function getServiceServiceHierarchy() {
-    return JSON.parse(JSON.stringify(
-      {
-        '6e59c5de-f052-46fa-aa7e-2fca9d674c44': {
-          'service': {
-            'uuid': '6e59c5de-f052-46fa-aa7e-2fca9d674c44',
-            'invariantUuid': 'e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0',
-            'name': 'ComplexService',
-            'version': '1.0',
-            'toscaModelURL': null,
-            'category': 'Emanuel',
-            'serviceType': '',
-            'serviceRole': '',
-            'description': 'ComplexService',
-            'serviceEcompNaming': 'true',
-            'instantiationType': 'Macro',
-            'inputs': {}
-          },
-          'vnfs': {
-            'VF_vGeraldine 0': {
-              'uuid': 'd6557200-ecf2-4641-8094-5393ae3aae60',
-              'invariantUuid': '4160458e-f648-4b30-a176-43881ffffe9e',
-              'description': 'VSP_vGeraldine',
-              'name': 'VF_vGeraldine',
-              'version': '2.0',
-              'customizationUuid': '91415b44-753d-494c-926a-456a9172bbb9',
-              'inputs': {},
-              'commands': {},
-              'properties': {
-                'max_instances': '3',
-                'min_instances': '1',
-                'gpb2_Internal2_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-ipv6-egress_src_start_port': '0',
-                'sctp-a-ipv6-egress_rule_application': 'any',
-                'Internal2_allow_transit': 'true',
-                'sctp-b-IPv6_ethertype': 'IPv6',
-                'sctp-a-egress_rule_application': 'any',
-                'sctp-b-ingress_action': 'pass',
-                'sctp-b-ingress_rule_protocol': 'icmp',
-                'ncb2_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-ipv6-ingress-src_start_port': '0.0',
-                'ncb1_Internal2_mac': '00:11:22:EF:AC:DF',
-                'fsb_volume_size_0': '320.0',
-                'sctp-b-egress_src_addresses': 'local',
-                'sctp-a-ipv6-ingress_ethertype': 'IPv4',
-                'sctp-a-ipv6-ingress-dst_start_port': '0',
-                'sctp-b-ipv6-ingress_rule_application': 'any',
-                'domain_name': 'default-domain',
-                'sctp-a-ingress_rule_protocol': 'icmp',
-                'sctp-b-egress-src_start_port': '0.0',
-                'sctp-a-egress_src_addresses': 'local',
-                'sctp-b-display_name': 'epc-sctp-b-ipv4v6-sec-group',
-                'sctp-a-egress-src_start_port': '0.0',
-                'sctp-a-ingress_ethertype': 'IPv4',
-                'sctp-b-ipv6-ingress-dst_end_port': '65535',
-                'sctp-b-dst_subnet_prefix_v6': '::',
-                'nf_naming': '{ecomp_generated_naming=true}',
-                'sctp-a-ipv6-ingress_src_subnet_prefix': '0.0.0.0',
-                'sctp-b-egress-dst_start_port': '0.0',
-                'ncb_flavor_name': 'nv.c20r64d1',
-                'gpb1_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-egress_dst_subnet_prefix_len': '0.0',
-                'Internal2_net_cidr': '10.0.0.10',
-                'sctp-a-ingress-dst_start_port': '0.0',
-                'sctp-a-egress-dst_start_port': '0.0',
-                'fsb1_Internal2_mac': '00:11:22:EF:AC:DF',
-                'sctp-a-egress_ethertype': 'IPv4',
-                'vlc_st_service_mode': 'in-network-nat',
-                'sctp-a-ipv6-egress_ethertype': 'IPv4',
-                'sctp-a-egress-src_end_port': '65535.0',
-                'sctp-b-ipv6-egress_rule_application': 'any',
-                'sctp-b-egress_action': 'pass',
-                'sctp-a-ingress-src_subnet_prefix_len': '0.0',
-                'sctp-b-ipv6-ingress-src_end_port': '65535.0',
-                'sctp-b-name': 'epc-sctp-b-ipv4v6-sec-group',
-                'fsb2_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-a-ipv6-ingress-src_start_port': '0.0',
-                'sctp-b-ipv6-egress_ethertype': 'IPv4',
-                'Internal1_net_cidr': '10.0.0.10',
-                'sctp-a-egress_dst_subnet_prefix': '0.0.0.0',
-                'fsb_flavor_name': 'nv.c20r64d1',
-                'sctp_rule_protocol': '132',
-                'sctp-b-ipv6-ingress_src_subnet_prefix_len': '0',
-                'sctp-a-ipv6-ingress_rule_application': 'any',
-                'sctp-a-IPv6_ethertype': 'IPv6',
-                'vlc2_Internal1_mac': '00:11:22:EF:AC:DF',
-                'vlc_st_virtualization_type': 'virtual-machine',
-                'sctp-b-ingress-dst_start_port': '0.0',
-                'sctp-b-ingress-dst_end_port': '65535.0',
-                'sctp-a-ipv6-ingress-src_end_port': '65535.0',
-                'sctp-a-display_name': 'epc-sctp-a-ipv4v6-sec-group',
-                'sctp-b-ingress_rule_application': 'any',
-                'int2_sec_group_name': 'int2-sec-group',
-                'vlc_flavor_name': 'nd.c16r64d1',
-                'sctp-b-ipv6-egress_src_addresses': 'local',
-                'vlc_st_interface_type_int1': 'other1',
-                'sctp-b-egress-src_end_port': '65535.0',
-                'sctp-a-ipv6-egress-dst_start_port': '0',
-                'vlc_st_interface_type_int2': 'other2',
-                'sctp-a-ipv6-egress_rule_protocol': 'any',
-                'Internal2_shared': 'false',
-                'sctp-a-ipv6-egress_dst_subnet_prefix_len': '0',
-                'Internal2_rpf': 'disable',
-                'vlc1_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-ipv6-egress_src_end_port': '65535',
-                'sctp-a-ipv6-egress_src_addresses': 'local',
-                'sctp-a-ingress-dst_end_port': '65535.0',
-                'sctp-a-ipv6-egress_src_end_port': '65535',
-                'Internal1_forwarding_mode': 'l2',
-                'Internal2_dhcp': 'false',
-                'sctp-a-dst_subnet_prefix_v6': '::',
-                'pxe_image_name': 'MME_PXE-Boot_16ACP04_GA.qcow2',
-                'vlc_st_interface_type_gtp': 'other0',
-                'ncb1_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-src_subnet_prefix_v6': '::',
-                'sctp-a-egress_dst_subnet_prefix_len': '0.0',
-                'int1_sec_group_name': 'int1-sec-group',
-                'Internal1_dhcp': 'false',
-                'sctp-a-ipv6-egress_dst_end_port': '65535',
-                'Internal2_forwarding_mode': 'l2',
-                'fsb2_Internal2_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-egress_dst_subnet_prefix': '0.0.0.0',
-                'Internal1_net_cidr_len': '17',
-                'gpb2_Internal1_mac': '00:11:22:EF:AC:DF',
-                'sctp-b-ingress-src_subnet_prefix_len': '0.0',
-                'sctp-a-ingress_dst_addresses': 'local',
-                'sctp-a-egress_action': 'pass',
-                'fsb_volume_type_0': 'SF-Default-SSD',
-                'ncb2_Internal2_mac': '00:11:22:EF:AC:DF',
-                'vlc_st_interface_type_sctp_a': 'left',
-                'vlc_st_interface_type_sctp_b': 'right',
-                'sctp-a-src_subnet_prefix_v6': '::',
-                'vlc_st_version': '2',
-                'sctp-b-egress_ethertype': 'IPv4',
-                'sctp-a-ingress_rule_application': 'any',
-                'gpb1_Internal2_mac': '00:11:22:EF:AC:DF',
-                'instance_ip_family_v6': 'v6',
-                'sctp-a-ipv6-egress_src_start_port': '0',
-                'sctp-b-ingress-src_start_port': '0.0',
-                'sctp-b-ingress_dst_addresses': 'local',
-                'fsb1_Internal1_mac': '00:11:22:EF:AC:DF',
-                'vlc_st_interface_type_oam': 'management',
-                'multi_stage_design': 'false',
-                'oam_sec_group_name': 'oam-sec-group',
-                'Internal2_net_gateway': '10.0.0.10',
-                'sctp-a-ipv6-ingress-dst_end_port': '65535',
-                'sctp-b-ipv6-egress-dst_start_port': '0',
-                'Internal1_net_gateway': '10.0.0.10',
-                'sctp-b-ipv6-egress_rule_protocol': 'any',
-                'gtp_sec_group_name': 'gtp-sec-group',
-                'sctp-a-ipv6-egress_dst_subnet_prefix': '0.0.0.0',
-                'sctp-b-ipv6-egress_dst_subnet_prefix_len': '0',
-                'sctp-a-ipv6-ingress_dst_addresses': 'local',
-                'sctp-a-egress_rule_protocol': 'icmp',
-                'sctp-b-ipv6-egress_action': 'pass',
-                'sctp-a-ipv6-egress_action': 'pass',
-                'Internal1_shared': 'false',
-                'sctp-b-ipv6-ingress_rule_protocol': 'any',
-                'Internal2_net_cidr_len': '17',
-                'sctp-a-name': 'epc-sctp-a-ipv4v6-sec-group',
-                'sctp-a-ingress-src_end_port': '65535.0',
-                'sctp-b-ipv6-ingress_src_subnet_prefix': '0.0.0.0',
-                'sctp-a-egress-dst_end_port': '65535.0',
-                'sctp-a-ingress_action': 'pass',
-                'sctp-b-egress_rule_protocol': 'icmp',
-                'sctp-b-ipv6-ingress_action': 'pass',
-                'vlc_st_service_type': 'firewall',
-                'sctp-b-ipv6-egress_dst_end_port': '65535',
-                'sctp-b-ipv6-ingress-dst_start_port': '0',
-                'vlc2_Internal2_mac': '00:11:22:EF:AC:DF',
-                'vlc_st_availability_zone': 'true',
-                'fsb_volume_image_name_1': 'MME_FSB2_16ACP04_GA.qcow2',
-                'sctp-b-ingress-src_subnet_prefix': '0.0.0.0',
-                'sctp-a-ipv6-ingress_src_subnet_prefix_len': '0',
-                'Internal1_allow_transit': 'true',
-                'gpb_flavor_name': 'nv.c20r64d1',
-                'availability_zone_max_count': '1',
-                'fsb_volume_image_name_0': 'MME_FSB1_16ACP04_GA.qcow2',
-                'sctp-b-ipv6-ingress_dst_addresses': 'local',
-                'sctp-b-ipv6-egress_dst_subnet_prefix': '0.0.0.0',
-                'sctp-b-ipv6-ingress_ethertype': 'IPv4',
-                'vlc1_Internal2_mac': '00:11:22:EF:AC:DF',
-                'sctp-a-ingress-src_subnet_prefix': '0.0.0.0',
-                'sctp-a-ipv6-ingress_action': 'pass',
-                'Internal1_rpf': 'disable',
-                'sctp-b-ingress_ethertype': 'IPv4',
-                'sctp-b-egress_rule_application': 'any',
-                'sctp-b-ingress-src_end_port': '65535.0',
-                'sctp-a-ipv6-ingress_rule_protocol': 'any',
-                'sctp-a-ingress-src_start_port': '0.0',
-                'sctp-b-egress-dst_end_port': '65535.0'
-              },
-              'type': 'VF',
-              'modelCustomizationName': 'VF_vGeraldine 0',
-              'vfModules': {
-                'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': {
-                  'uuid': '522159d5-d6e0-4c2a-aa44-5a542a12a830',
-                  'invariantUuid': '98a7c88b-b577-476a-90e4-e25a5871e02b',
-                  'customizationUuid': '55b1be94-671a-403e-a26c-667e9c47d091',
-                  'description': null,
-                  'name': 'VfVgeraldine..vflorence_vlc..module-1',
-                  'version': '2',
-                  'modelCustomizationName': 'VfVgeraldine..vflorence_vlc..module-1',
-                  'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0},
-                  'commands': {},
-                  'volumeGroupAllowed': false
-                },
-                'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': {
-                  'uuid': '41708296-e443-4c71-953f-d9a010f059e1',
-                  'invariantUuid': '1cca90b8-3490-495e-87da-3f3e4c57d5b9',
-                  'customizationUuid': '6add59e0-7fe1-4bc4-af48-f8812422ae7c',
-                  'description': null,
-                  'name': 'VfVgeraldine..vflorence_gpb..module-2',
-                  'version': '2',
-                  'modelCustomizationName': 'VfVgeraldine..vflorence_gpb..module-2',
-                  'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0},
-                  'commands': {},
-                  'volumeGroupAllowed': false
-                },
-                'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': {
-                  'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87',
-                  'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d',
-                  'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861',
-                  'description': null,
-                  'name': 'VfVgeraldine..base_vflorence..module-0',
-                  'version': '2',
-                  'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0',
-                  'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1},
-                  'commands': {},
-                  'volumeGroupAllowed': true
-                }
-              },
-              'volumeGroups': {
-                'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': {
-                  'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87',
-                  'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d',
-                  'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861',
-                  'description': null,
-                  'name': 'VfVgeraldine..base_vflorence..module-0',
-                  'version': '2',
-                  'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0',
-                  'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1}
-                }
-              }
-            }
-          },
-          'networks': {
-            'ExtVL 0': {
-              'uuid': 'ddc3f20c-08b5-40fd-af72-c6d14636b986',
-              'invariantUuid': '379f816b-a7aa-422f-be30-17114ff50b7c',
-              'description': 'ECOMP generic virtual link (network) base type for all other service-level and global networks',
-              'name': 'ExtVL',
-              'version': '37.0',
-              'customizationUuid': '94fdd893-4a36-4d70-b16a-ec29c54c184f',
-              'inputs': {},
-              'commands': {},
-              'properties': {
-                'network_assignments': '{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}',
-                'exVL_naming': '{ecomp_generated_naming=true}',
-                'network_flows': '{is_network_policy=false, is_bound_to_vpn=false}',
-                'network_homing': '{ecomp_selected_instance_node_target=false}'
-              },
-              'type': 'VL',
-              'modelCustomizationName': 'ExtVL 0'
-            }
-          },
-          'configurations': {
-            'Port Mirroring Configuration By Policy 0': {
-              'uuid': 'b4398538-e89d-4f13-b33d-ca323434ba50',
-              'invariantUuid': '6ef0ca40-f366-4897-951f-abd65d25f6f7',
-              'description': 'A port mirroring configuration by policy object',
-              'name': 'Port Mirroring Configuration By Policy',
-              'version': '27.0',
-              'customizationUuid': '3c3b7b8d-8669-4b3b-8664-61970041fad2',
-              'inputs': {},
-              'commands': {},
-              'properties': {},
-              'type': 'Configuration',
-              'modelCustomizationName': 'Port Mirroring Configuration By Policy 0',
-              'sourceNodes': [],
-              'collectorNodes': null,
-              'configurationByPolicy': false
-            }
-          },
-          'serviceProxies': {},
-          'vfModules': {
-            'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': {
-              'uuid': '522159d5-d6e0-4c2a-aa44-5a542a12a830',
-              'invariantUuid': '98a7c88b-b577-476a-90e4-e25a5871e02b',
-              'customizationUuid': '55b1be94-671a-403e-a26c-667e9c47d091',
-              'description': null,
-              'name': 'VfVgeraldine..vflorence_vlc..module-1',
-              'version': '2',
-              'modelCustomizationName': 'VfVgeraldine..vflorence_vlc..module-1',
-              'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0},
-              'commands': {},
-              'volumeGroupAllowed': false
-            },
-            'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': {
-              'uuid': '41708296-e443-4c71-953f-d9a010f059e1',
-              'invariantUuid': '1cca90b8-3490-495e-87da-3f3e4c57d5b9',
-              'customizationUuid': '6add59e0-7fe1-4bc4-af48-f8812422ae7c',
-              'description': null,
-              'name': 'VfVgeraldine..vflorence_gpb..module-2',
-              'version': '2',
-              'modelCustomizationName': 'VfVgeraldine..vflorence_gpb..module-2',
-              'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0},
-              'commands': {},
-              'volumeGroupAllowed': false
-            },
-            'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': {
-              'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87',
-              'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d',
-              'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861',
-              'description': null,
-              'name': 'VfVgeraldine..base_vflorence..module-0',
-              'version': '2',
-              'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0',
-              'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1},
-              'commands': {},
-              'volumeGroupAllowed': true
-            }
-          },
-          'volumeGroups': {
-            'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': {
-              'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87',
-              'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d',
-              'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861',
-              'description': null,
-              'name': 'VfVgeraldine..base_vflorence..module-0',
-              'version': '2',
-              'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0',
-              'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1}
-            }
-          },
-          'pnfs': {}
-        }
-      }
-    ));
-  }
 });
index c9a89cf..56d708b 100644 (file)
@@ -77,7 +77,13 @@ export class AvailableModelsTreeService {
   shouldOpenVRFModal(nodes, serviceModelId: string , service)  {
     for(const node of nodes){
       if(node.type === 'VRF' && service.serviceInstance[serviceModelId].existingVRFCounterMap && !service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId]){
-        const vrfModel : VrfModel = node.getModel(node.name, node, service.serviceInstance[serviceModelId]);
+        const serviceHierarchy = service.serviceHierarchy[serviceModelId];
+
+        const instanceModel = this._sharedTreeService.modelByIdentifiers(
+          serviceHierarchy, node.modelTypeName, node.modelCustomizationId, node.name
+        );
+
+        const vrfModel : VrfModel = node.getModel(instanceModel);
         const vrfCounter : number = service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId];
         console.log('vrfCounter', vrfCounter);
         if(vrfModel.min > 0 && (_.isNil(vrfCounter) || vrfCounter === 0)){
index a195cf0..1a42db4 100644 (file)
@@ -228,7 +228,13 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
     this.highlightNode.emit(node.data.modelUniqueId);
     if (FeatureFlagsService.getFlagState(Features.FLAG_1906_COMPONENT_INFO, this.store)) {
       const serviceHierarchy = this._store.getState().service.serviceHierarchy[this.serviceModelId];
-      const model = node.data.getModel(node.data.modelName, node.data, serviceHierarchy);
+
+      const instanceModel = this._sharedTreeService.modelByIdentifiers(
+        serviceHierarchy, node.data.modelTypeName,
+        this._sharedTreeService.modelUniqueNameOrId(node.data), node.data.modelName
+      );
+
+      const model = node.data.getModel(instanceModel);
       const modelInfoItems = node.data.getInfo(model, node.data);
       const componentInfoModel: ComponentInfoModel = this._sharedTreeService.addGeneralInfoItems(modelInfoItems, node.data.componentInfoType, model, node.data);
       ComponentInfoService.triggerComponentInfoChange.next(componentInfoModel);
index 9c10206..eae534c 100644 (file)
@@ -1,6 +1,6 @@
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {AvailableNodeIcons} from "../../available-models-tree/available-models-tree.service";
-import {ComponentInfoModel, ComponentInfoType} from "../../component-info/component-info-model";
+import {ComponentInfoType} from "../../component-info/component-info-model";
 import {ModelInformationItem} from "../../../../shared/components/model-information/model-information.component";
 
 export interface ILevelNodeInfo {
@@ -44,12 +44,11 @@ export interface ILevelNodeInfo {
   updatePosition(node, that, instanceId, parentStoreKey?) : void;
 
   /***********************************************************
-   * return object instance
-   * @param modelId - The model id
-   * @param serviceHierarchy - The serviceHierarchy store
-   * @param instance - existing instance details
+   * return a NodeModel object instance
+   * @param instanceModel - The model of the instance (usually extracted from
+   *        serviceHierarchy store)
    ************************************************************/
-  getModel(modelId: string, instance: any, serviceHierarchy): any;
+  getModel(instanceModel: any): any;
 
   /***********************************************************
    * return dynamic inputs of current model
index f3f9518..2f143fa 100644 (file)
@@ -83,10 +83,7 @@ describe('Collection Resource Model Info', () => {
   });
 
   test('getModel should return collectionResource model', () => {
-    let model: CollectionResourceModel = collectionResourceModel.getModel('CR_sanity 0', <any>{
-      originalName : 'CR_sanity 0'
-    }, getServiceHierarchy());
-    expect(model.type).toEqual('CR');
+    expect(collectionResourceModel.getModel({})).toBeInstanceOf(CollectionResourceModel);
   });
 
   test('cr getMenuAction: delete', ()=>{
@@ -101,1108 +98,4 @@ describe('Collection Resource Model Info', () => {
     expect(result['delete']['method']).toHaveBeenCalledWith(node, serviceModelId);
   });
 
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "collectionResources": {
-        "CR_sanity 0": {
-          "uuid": "3467f91f-1a2a-4013-a5ed-8ad99d4e06ad",
-          "invariantUuid": "d0060da6-82b8-4ca0-9758-5eb2b111b926",
-          "description": "CR_sanity",
-          "name": "CR_sanity",
-          "version": "1.0",
-          "customizationUuid": "7160c618-9314-4c09-8717-b77f3d29d946",
-          "inputs": {},
-          "commands": {},
-          "properties": {
-            "cr_sanity..Fixed..0_quantity": "10",
-            "cr_sanity..NetworkCollection..0_network_collection_function": "ABCD",
-            "ecomp_generated_naming": "false",
-            "cr_sanity..NetworkCollection..0_network_collection_description": "ABCD"
-          },
-          "type": "CR",
-          "category": "Network L2-3",
-          "subcategory": "Infrastructure",
-          "resourceVendor": "ATT",
-          "resourceVendorRelease": "2018.06",
-          "resourceVendorModelNumber": "",
-          "customizationUUID": "7160c618-9314-4c09-8717-b77f3d29d946",
-          "networksCollection": {
-            "cr_sanity..NetworkCollection..0": {
-              "uuid": "445d7fa8-3e59-4606-bd76-30ba5fc677d3",
-              "invariantUuid": "9dc623b8-0ae8-47ad-a791-a21b8d8e94a8",
-              "name": "cr_sanity..NetworkCollection..0",
-              "version": "1",
-              "networkCollectionProperties": {
-                "networkCollectionFunction": "ABCD",
-                "networkCollectionDescription": "ABCD"
-              }
-            }
-          }
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
-
 });
index c9c718f..d144837 100644 (file)
@@ -28,12 +28,10 @@ export class CollectionResourceModelInfo implements ILevelNodeInfo{
 
   updateDynamicInputsDataFromModel = (currentModel): any => [];
 
-  getModel = (collectionResourceModelId: string, instance: CollectionResourceInstance, serviceHierarchy): CollectionResourceModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
-    return new CollectionResourceModel(this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, collectionResourceModelId));
+  getModel = (instanceModel): CollectionResourceModel => {
+    return new CollectionResourceModel(instanceModel);
   };
 
-
   createInstanceTreeNode = (instance: any, model: any, parentModel: any, storeKey: string, serviceModelId: string): any => {
       let node = new CollectionResourceTreeNode(instance, model, storeKey);
       node.missingData = this.hasMissingData(instance, node, model.isEcompGeneratedNaming);
index d1d6817..aa69b53 100644 (file)
@@ -54,1451 +54,8 @@ describe('Vnf Model Info', () => {
 
   test('getModel should return Configuration model', () => {
     let configurationModelInfo: ConfigurationModelInfo = new ConfigurationModelInfo(_dynamicInputsService, _sharedTreeService);
-    let model = configurationModelInfo.getModel('2017-388_PASQUALE-vPE 1__configuration', getServiceHierarchy());
-    expect(model.uuid).toEqual('0903e1c0-8e03-4936-b5c2-260653b96413');
+    let model = configurationModelInfo.getModel({ uuid: 'foo' });
+    expect(model.uuid).toEqual('foo');
   });
 
-
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        }
-      },
-      "collectionResources": {},
-      "configurations": {
-        "2017-388_PASQUALE-vPE 1__configuration": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        }
-
-      },
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
 });
index 31c4439..9845fb6 100644 (file)
@@ -26,14 +26,11 @@ export class ConfigurationModelInfo implements ILevelNodeInfo{
   getType = () : string => "Configuration";
 
   /***********************************************************
-   * return configuration model
-   * @param configurationModelId - current Model id
-   * @param serviceHierarchy - serviceHierarchy
+   * @param instanceModel - The model of the instance (usually extracted from serviceHierarchy store)
    ************************************************************/
-  getModel = (configurationModelId : string, serviceHierarchy) : any =>{
-    const model = this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, configurationModelId);
-    if (!_.isNil(model)) {
-      return model;
+  getModel = (instanceModel: any) : any =>{
+    if (!_.isNil(instanceModel)) {
+      return instanceModel;
     }
     return {};
   };
index 5c03b37..650d975 100644 (file)
@@ -32,7 +32,7 @@ export class NcfModelInfo implements ILevelNodeInfo {
 
   updateDynamicInputsDataFromModel = (currentModel): any => [];
 
-  getModel = (modelId: string, instance: any, serviceHierarchy): any => {
+  getModel = (instanceModel: any): any => {
     return new Level1Model();
   };
 
index f26ab0c..bb8e882 100644 (file)
@@ -13,6 +13,7 @@ import {IframeService} from "../../../../../shared/utils/iframe.service";
 import {DuplicateService} from "../../../duplicate/duplicate.service";
 import {ModelInformationItem} from "../../../../../shared/components/model-information/model-information.component";
 import {FeatureFlagsService} from "../../../../../shared/services/featureFlag/feature-flags.service";
+import {NetworkModel} from "../../../../../shared/models/networkModel";
 
 class MockAppStore<T> {
   getState() {
@@ -146,8 +147,7 @@ describe('Network Model Info', () => {
   });
 
   test('getModel should return Network model', () => {
-    let model = networkModel.getModel('2017-388_PASQUALE-vPE 1_1', <any>{}, getServiceHierarchy());
-    expect(model.type).toEqual('VL');
+    expect(networkModel.getModel({})).toBeInstanceOf(NetworkModel);
   });
 
   test('showNodeIcons should return false if reachLimit of max', () => {
@@ -387,1259 +387,4 @@ describe('Network Model Info', () => {
     };
   }
 
-
-  function getServiceHierarchy() {
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {
-        "2017-388_PASQUALE-vPE 1_1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VL",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        }
-      },
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
 });
index ae28fc2..ce1af45 100644 (file)
@@ -1,6 +1,5 @@
 import {DynamicInputsService} from "../../dynamicInputs.service";
 import {ILevelNodeInfo} from "../basic.model.info";
-import {NetworkInstance} from "../../../../../shared/models/networkInstance";
 import {NetworkModel} from "../../../../../shared/models/networkModel";
 import {NetworkTreeNode} from "../../../../../shared/models/networkTreeNode";
 import {SharedTreeService} from "../../shared.tree.service";
@@ -65,15 +64,12 @@ export class NetworkModelInfo implements ILevelNodeInfo {
   };
 
   /***********************************************************
-   * return network model
-   * @param networkModelId - current Model id
-   * @param instance
-   * @param serviceHierarchy - serviceHierarchy
+   * return a NodeModel object instance
+   * @param instanceModel - The model of the instance (usually extracted from serviceHierarchy store)
    ************************************************************/
-  getModel = (networkModelId: string, instance: NetworkInstance, serviceHierarchy): NetworkModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
+  getModel = (instanceModel: any): NetworkModel => {
     return new NetworkModel(
-      this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, networkModelId),
+      instanceModel,
       this._featureFlagsService.getAllFlags());
   };
 
index 8a09372..8675d36 100644 (file)
@@ -14,6 +14,8 @@ import {MockNgRedux, NgReduxTestingModule} from "@angular-redux/store/testing";
 import {HttpClient, HttpHandler} from "@angular/common/http";
 import {CollectionResourceModel} from "../../../../../shared/models/collectionResourceModel";
 import {ComponentInfoType} from "../../../component-info/component-info-model";
+import {VNFModel} from "../../../../../shared/models/vnfModel";
+import {PNFModel} from "../../../../../shared/models/pnfModel";
 
 
 describe('PNF model info', () => {
@@ -77,61 +79,7 @@ describe('PNF model info', () => {
   });
 
   test('getModel should return pnf model', () => {
-    let model: CollectionResourceModel = pnfModel.getModel('PNF1', <any>{
-      originalName : 'PNF1'
-    }, getServiceHierarchy());
-    expect(model.type).toEqual('PNF');
+    expect(pnfModel.getModel({})).toBeInstanceOf(PNFModel);
   });
 
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "12550cd7-7708-4f53-a09e-41d3d6327ebc",
-        "invariantUuid": "561faa57-7bbb-40ec-a81c-c0d4133e98d4",
-        "name": "AIM Transport SVC_ym161f",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "Network L1-3",
-        "serviceType": "TRANSPORT",
-        "serviceRole": "AIM",
-        "description": "AIM Transport service",
-        "serviceEcompNaming": "true",
-        "instantiationType": "Macro",
-        "inputs": {},
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other",
-          "viewEditUI": "legacy"
-        }
-      },
-      "vnfs": {},
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {},
-      "volumeGroups": {},
-      "pnfs": {
-        "PNF1": {
-          "uuid": "1c831fa9-28a6-4778-8c1d-80b9e769f2ed",
-          "invariantUuid": "74e13a12-dac9-4fba-b102-cd242d9e7f02",
-          "description": "AIM Transport service",
-          "name": "AIM PNF Model",
-          "version": "1.0",
-          "customizationUuid": "dce78da7-c842-47a1-aba2-2de1cd03ab7a",
-          "inputs": {},
-          "commands": {},
-          "properties": {
-            "nf_function": "SDNGW",
-            "nf_role": "pD2IPE",
-            "ecomp_generated_naming": "false",
-            "nf_type": "ROUTER"
-          },
-          "type": "PNF"
-        }
-      },
-      "vnfGroups": {}
-    }
-  }
 })
index b875515..a7931b2 100644 (file)
@@ -5,8 +5,8 @@ import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
 import {PnfInstance} from "app/shared/models/pnfInstance";
 import {PNFModel} from "../../../../../shared/models/pnfModel";
-import {PnfTreeNode} from "../../../../../shared/models/pnfTreeNode";
 import {SharedTreeService} from "../../shared.tree.service";
+import {NodeModelResponseInterface} from "../../../../../shared/models/nodeModel";
 
 
 export class PnfModelInfo implements ILevelNodeInfo{
@@ -31,9 +31,8 @@ export class PnfModelInfo implements ILevelNodeInfo{
     return {};
   }
 
-  getModel = (pnfModelId: string, instance: PnfInstance, serviceHierarchy): PNFModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
-    return new PNFModel(this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, pnfModelId));
+  getModel = (instanceModel: any): PNFModel => {
+    return new PNFModel(instanceModel);
   };
 
   getNextLevelObject(): any { return null;  }
index 59ef35a..8073d17 100644 (file)
@@ -109,10 +109,7 @@ describe('Related Vnf member Model Info', () => {
   });
 
   test('getModel should return VNF model', () => {
-    let model: VNFModel = relatedVnfMemeber.getModel('2017-388_PASQUALE-vPE 1', <any>{
-      originalName : '2017-388_PASQUALE-vPE 1'
-    }, getServiceHierarchy());
-    expect(model.type).toEqual('VF');
+    expect(relatedVnfMemeber.getModel({})).toBeInstanceOf(VNFModel);
   });
 
 
@@ -141,1073 +138,4 @@ describe('Related Vnf member Model Info', () => {
     expect(result['undoDelete']['method']).toHaveBeenCalledWith(node, serviceModelId);
   });
 
-
-
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
 });
index f31a3b2..fdd4c22 100644 (file)
@@ -11,7 +11,6 @@ import {
   removeRelatedVnfMemberInstance,
   undoDeleteActionRelatedVnfMemberInstance
 } from "../../../../../shared/storeUtil/utils/relatedVnfMember/relatedVnfMember.actions";
-import {VnfInstance} from "../../../../../shared/models/vnfInstance";
 import {VNFModel} from "../../../../../shared/models/vnfModel";
 import {VnfTreeNode} from "../../../../../shared/models/vnfTreeNode";
 import {InputType} from "../../../../../shared/models/inputTypes";
@@ -48,14 +47,12 @@ export class RelatedVnfMemberInfoModel implements ILevelNodeInfo {
   };
 
   /***********************************************************
-   * return vnf model
-   * @param vnfModelId - current Model id
-   * @param instance - vnf instance
-   * @param serviceHierarchy - serviceHierarchy
+   * return a NodeModel object instance
+   * @param instanceModel - The model of the instance (usually extracted from
+   *        serviceHierarchy store)
    ************************************************************/
-  getModel = (vnfModelId: string, instance: VnfInstance, serviceHierarchy): VNFModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
-    return new VNFModel(this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, vnfModelId));
+  getModel = (instanceModel: any): VNFModel => {
+    return new VNFModel(instanceModel);
   };
 
 
index 2162318..c225687 100644 (file)
@@ -128,7 +128,29 @@ describe('VFModule Model Info', () => {
   });
 
   test('getModel should return Module model', () => {
-    let model = vfModuleModel.getModel('2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1',null, getServiceHierarchy());
+    let model = vfModuleModel.getModel({
+      "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
+      "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+      "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+      "description": null,
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+      "version": "6",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+      "properties": {
+        "minCountInstances": 2,
+        "maxCountInstances": 3,
+        "initialCount": 0,
+        "vfModuleLabel": "PASQUALE_vRE_BV",
+        "baseModule": false
+      },
+      "inputs": {
+        "vnf_config_template_version": {
+          "type": "string"
+        }
+      },
+      "volumeGroupAllowed": true
+    });
+    expect(model).toBeInstanceOf(VfModule);
     expect(model.uuid).toEqual('25284168-24bb-4698-8cb4-3f509146eca5');
     expect(model.min).toBe(2);
     expect(model.max).toBe(3);
@@ -629,938 +651,4 @@ describe('VFModule Model Info', () => {
     };
   }
 
-
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1":{
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 2,
-                "maxCountInstances": 3,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 2,
-            "maxCountInstances": 3,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
 });
index dcc6a29..f442e15 100644 (file)
@@ -74,14 +74,12 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
 
   /***********************************************************
    * return vfModule model
-   * @param vfModuleModelId - current Model id
-   * @param instance
-   * @param serviceHierarchy - serviceHierarchy
+   * @param instanceModel - The model of the instance (usually extracted from
+   *        serviceHierarchy store)
    ************************************************************/
-  getModel = (vfModuleModelId: string, instance, serviceHierarchy): Partial<VfModule> => {
-    const model = this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, vfModuleModelId);
-    if (!_.isNil(model)) {
-      return new VfModule(model, this._featureFlagsService.getAllFlags());
+  getModel = (instanceModel: any): Partial<VfModule> => {
+    if (!_.isNil(instanceModel)) {
+      return new VfModule(instanceModel, this._featureFlagsService.getAllFlags());
     }
     return {};
   };
index f700ed4..53aeddd 100644 (file)
@@ -145,10 +145,7 @@ describe('Vnf Model Info', () => {
   });
 
   test('getModel should return VNF model', () => {
-    let model: VNFModel = vnfModel.getModel('2017-388_PASQUALE-vPE 1', <any>{
-      originalName : '2017-388_PASQUALE-vPE 1'
-    }, getServiceHierarchy());
-    expect(model.type).toEqual('VF');
+    expect(vnfModel.getModel({})).toBeInstanceOf(VNFModel);
   });
 
   test('showNodeIcons should return false if reachLimit of max', ()=>{
@@ -607,1072 +604,4 @@ describe('Vnf Model Info', () => {
     };
   }
 
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfs": {
-        "2017-388_PASQUALE-vPE 1": {
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "1.0",
-          "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-388_PASQUALE-vPE 0": {
-          "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-388_PASQUALE-vPE",
-          "version": "4.0",
-          "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
-          "vfModules": {},
-          "volumeGroups": {},
-          "vfcInstanceGroups": {}
-        },
-        "2017-488_PASQUALE-vPE 0": {
-          "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
-          "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-          "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-          "name": "2017-488_PASQUALE-vPE",
-          "version": "5.0",
-          "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "ASN": {
-              "type": "string",
-              "description": "AV/PE",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "AV_vPE"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": null,
-              "constraints": [],
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "commands": {
-            "vnf_config_template_version": {
-              "displayName": "vnf_config_template_version",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-            },
-            "bandwidth_units": {
-              "displayName": "bandwidth_units",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth_units"
-            },
-            "bandwidth": {
-              "displayName": "bandwidth",
-              "command": "get_input",
-              "inputName": "pasqualevpe0_bandwidth"
-            },
-            "AIC_CLLI": {
-              "displayName": "AIC_CLLI",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-            },
-            "ASN": {
-              "displayName": "ASN",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_ASN"
-            },
-            "vnf_instance_name": {
-              "displayName": "vnf_instance_name",
-              "command": "get_input",
-              "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-            }
-          },
-          "properties": {
-            "vmxvre_retype": "RE-VMX",
-            "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
-            "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
-            "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
-            "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
-            "int_ctl_net_name": "VMX-INTXI",
-            "vmx_int_ctl_prefix": "10.0.0.10",
-            "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
-            "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
-            "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
-            "nf_type": "vPE",
-            "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
-            "is_AVPN_service": "false",
-            "vmx_RSG_name": "vREXI-affinity",
-            "vmx_int_ctl_forwarding": "l2",
-            "vmxvre_oam_ip_0": "10.0.0.10",
-            "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_sriov41_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-            "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
-            "vmxvre_instance": "0",
-            "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvre_flavor_name": "ns.c1r16d32.v5",
-            "vmxvpfe_volume_size_0": "40.0",
-            "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-            "nf_naming": "{ecomp_generated_naming=false}",
-            "nf_naming_code": "Navneet",
-            "vmxvre_name_0": "vREXI",
-            "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-            "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-            "max_instances": "3",
-            "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-            "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
-            "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-            "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-            "vmxvre_console": "vidconsole",
-            "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-            "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-            "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-            "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-            "min_instances": "1",
-            "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-            "vf_module_id": "123",
-            "nf_function": "JAI",
-            "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-            "vmxvre_int_ctl_ip_0": "10.0.0.10",
-            "ecomp_generated_naming": "false",
-            "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-            "vnf_name": "mtnj309me6vre",
-            "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-            "vmxvre_volume_type_1": "HITACHI",
-            "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-            "vmxvre_volume_type_0": "HITACHI",
-            "vmxvpfe_volume_type_0": "HITACHI",
-            "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-            "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
-            "vnf_id": "123",
-            "vmxvre_oam_prefix": "24",
-            "availability_zone_0": "mtpocfo-kvm-az01",
-            "ASN": "get_input:2017488_pasqualevpe0_ASN",
-            "vmxvre_chassis_i2cid": "161",
-            "vmxvpfe_name_0": "vPFEXI",
-            "bandwidth": "get_input:pasqualevpe0_bandwidth",
-            "availability_zone_max_count": "1",
-            "vmxvre_volume_size_0": "45.0",
-            "vmxvre_volume_size_1": "50.0",
-            "vmxvpfe_sriov42_0_port_broadcastallow": "true",
-            "vmxvre_oam_gateway": "10.0.0.10",
-            "vmxvre_volume_name_1": "vREXI_FAVolume",
-            "vmxvre_ore_present": "0",
-            "vmxvre_volume_name_0": "vREXI_FBVolume",
-            "vmxvre_type": "0",
-            "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
-            "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-            "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-            "vmx_int_ctl_len": "24",
-            "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-            "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-            "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-            "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-            "nf_role": "Testing",
-            "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-            "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-            "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-          },
-          "type": "VF",
-          "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-          "vfModules": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              },
-              "volumeGroupAllowed": true
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-              "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "version": "5",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-              "properties": {
-                "minCountInstances": 1,
-                "maxCountInstances": 1,
-                "initialCount": 1,
-                "vfModuleLabel": "PASQUALE_base_vPE_BV",
-                "baseModule": true
-              },
-              "inputs": {},
-              "volumeGroupAllowed": false
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {},
-              "volumeGroupAllowed": true
-            }
-          },
-          "volumeGroups": {
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-              "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "baseModule": false
-              },
-              "inputs": {
-                "vnf_config_template_version": {
-                  "type": "string",
-                  "description": "VPE Software Version",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_config_template_version"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-                  "constraints": null,
-                  "required": true,
-                  "default": "17.2"
-                },
-                "bandwidth_units": {
-                  "type": "string",
-                  "description": "Units of bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth_units"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth_units",
-                  "constraints": null,
-                  "required": true,
-                  "default": "Gbps"
-                },
-                "bandwidth": {
-                  "type": "string",
-                  "description": "Requested VPE bandwidth",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "bandwidth"
-                  },
-                  "fromInputName": "pasqualevpe0_bandwidth",
-                  "constraints": null,
-                  "required": true,
-                  "default": "10"
-                },
-                "AIC_CLLI": {
-                  "type": "string",
-                  "description": "AIC Site CLLI",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "AIC_CLLI"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-                  "constraints": null,
-                  "required": true,
-                  "default": "ATLMY8GA"
-                },
-                "vnf_instance_name": {
-                  "type": "string",
-                  "description": "The hostname assigned to the vpe.",
-                  "entry_schema": null,
-                  "inputProperties": {
-                    "sourceType": "HEAT",
-                    "vfModuleLabel": "PASQUALE_vRE_BV",
-                    "paramName": "vnf_instance_name"
-                  },
-                  "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-                  "constraints": null,
-                  "required": true,
-                  "default": "mtnj309me6"
-                }
-              }
-            },
-            "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-              "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-              "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-              "description": null,
-              "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "version": "6",
-              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-              "properties": {
-                "minCountInstances": 0,
-                "maxCountInstances": null,
-                "initialCount": 0,
-                "vfModuleLabel": "PASQUALE_vPFE_BV",
-                "baseModule": false
-              },
-              "inputs": {}
-            }
-          },
-          "vfcInstanceGroups": {}
-        }
-      },
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          },
-          "volumeGroupAllowed": true
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-          "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-          "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-          "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "version": "5",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-          "properties": {
-            "minCountInstances": 1,
-            "maxCountInstances": 1,
-            "initialCount": 1,
-            "vfModuleLabel": "PASQUALE_base_vPE_BV",
-            "baseModule": true
-          },
-          "inputs": {},
-          "volumeGroupAllowed": false
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {},
-          "volumeGroupAllowed": true
-        }
-      },
-      "volumeGroups": {
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
-          "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
-          "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
-          "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vRE_BV",
-            "baseModule": false
-          },
-          "inputs": {
-            "vnf_config_template_version": {
-              "type": "string",
-              "description": "VPE Software Version",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_config_template_version"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
-              "constraints": null,
-              "required": true,
-              "default": "17.2"
-            },
-            "bandwidth_units": {
-              "type": "string",
-              "description": "Units of bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth_units"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth_units",
-              "constraints": null,
-              "required": true,
-              "default": "Gbps"
-            },
-            "bandwidth": {
-              "type": "string",
-              "description": "Requested VPE bandwidth",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "bandwidth"
-              },
-              "fromInputName": "pasqualevpe0_bandwidth",
-              "constraints": null,
-              "required": true,
-              "default": "10"
-            },
-            "AIC_CLLI": {
-              "type": "string",
-              "description": "AIC Site CLLI",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "AIC_CLLI"
-              },
-              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
-              "constraints": null,
-              "required": true,
-              "default": "ATLMY8GA"
-            },
-            "vnf_instance_name": {
-              "type": "string",
-              "description": "The hostname assigned to the vpe.",
-              "entry_schema": null,
-              "inputProperties": {
-                "sourceType": "HEAT",
-                "vfModuleLabel": "PASQUALE_vRE_BV",
-                "paramName": "vnf_instance_name"
-              },
-              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
-              "constraints": null,
-              "required": true,
-              "default": "mtnj309me6"
-            }
-          }
-        },
-        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
-          "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-          "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
-          "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
-          "description": null,
-          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "version": "6",
-          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-          "properties": {
-            "minCountInstances": 0,
-            "maxCountInstances": null,
-            "initialCount": 0,
-            "vfModuleLabel": "PASQUALE_vPFE_BV",
-            "baseModule": false
-          },
-          "inputs": {}
-        }
-      },
-      "pnfs": {}
-    }
-  }
-
 });
index b2b7b43..d391f4a 100644 (file)
@@ -87,10 +87,9 @@ export class VnfModelInfo implements ILevelNodeInfo {
    * @param instance - vnf instance
    * @param serviceHierarchy - serviceHierarchy
    ************************************************************/
-  getModel = (vnfModelId: string, instance: VnfInstance, serviceHierarchy): VNFModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
+  getModel = (instanceModel: any): VNFModel => {
     return new VNFModel(
-      this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, vnfModelId),
+      instanceModel,
       this._featureFlagsService.getAllFlags());
   };
 
index 802047c..057cdd3 100644 (file)
@@ -14,6 +14,7 @@ import {DrawingBoardModes} from "../../../drawing-board.modes";
 import {AaiService} from "../../../../../shared/services/aaiService/aai.service";
 import {FeatureFlagsService} from "../../../../../shared/services/featureFlag/feature-flags.service";
 import {ITableContent} from "../../../../../shared/components/searchMembersModal/members-table/element-table-row.model";
+import {VNFModel} from "../../../../../shared/models/vnfModel";
 
 describe('VnfGroupingModelInfo Model Info', () => {
   let injector;
@@ -171,10 +172,7 @@ describe('VnfGroupingModelInfo Model Info', () => {
   });
 
   test('getModel should return VnfGroup model', () => {
-    let model: VnfGroupModel = vnfGroupModel.getModel('ResourceGroup0', <any>{
-      originalName : 'ResourceGroup0'
-    }, getServiceHierarchy());
-    expect(model.type).toEqual('VnfGroup');
+    expect(vnfGroupModel.getModel({})).toBeInstanceOf(VnfGroupModel);
   });
 
   test('getMenuAction: showAuditInfoVnfGroup', ()=>{
@@ -266,156 +264,5 @@ describe('VnfGroupingModelInfo Model Info', () => {
     ]);
   });
 
-  function getServiceHierarchy(){
-    return {
-      "service": {
-        "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450",
-        "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-        "name": "action-data",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "",
-        "serviceType": "",
-        "serviceRole": "",
-        "description": "",
-        "serviceEcompNaming": "false",
-        "instantiationType": "Macro",
-        "inputs": {
-          "2017488_pasqualevpe0_ASN": {
-            "type": "string",
-            "description": "AV/PE",
-            "entry_schema": null,
-            "inputProperties": null,
-            "constraints": [],
-            "required": true,
-            "default": "AV_vPE"
-          }
-        },
-        "vidNotions": {
-          "instantiationUI": "legacy",
-          "modelCategory": "other"
-        }
-      },
-      "vnfGroups": {
-        "ResourceGroup0": {
-          "type": "VnfGroup",
-          "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
-          "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-          "version": "1",
-          "name": "ResourceGroup0",
-          "modelCustomizationName": "ResourceGroup0",
-          "properties": {
-            "contained_resource_type": "VF",
-            "role": "SERVICE-ACCESS",
-            "function": "DATA",
-            "description": "DDD0",
-            "type": "LOAD-GROUP"
-          },
-          "members": {
-            "vdorothea_svc_vprs_proxy 0": {
-              "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
-              "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
-              "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
-              "name": "vDOROTHEA_Svc_vPRS Service Proxy",
-              "version": "1.0",
-              "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
-              "inputs": {},
-              "commands": {},
-              "properties": {},
-              "type": "Service Proxy",
-              "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
-              "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
-              "sourceModelName": "vDOROTHEA_Svc_vPRS"
-            },
-            "vdorothea_svc_vprs_proxy 1": {
-              "uuid": "111dfa8-a0d9-443f-95ad-836cd044e26c",
-              "invariantUuid": "111ae0c-b3a5-4ca1-a777-afbffe7010bc",
-              "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
-              "name": "111_Svc_vPRS Service Proxy",
-              "version": "1.0",
-              "customizationUuid": "1113d23-e132-4ce7-af2c-a493b4cafac9",
-              "inputs": {},
-              "commands": {},
-              "properties": {},
-              "type": "Service Proxy",
-              "sourceModelUuid": "11127a2-366d-4be6-8c68-a69153c61274",
-              "sourceModelInvariant": "1112e6b-584b-4f45-80d4-fefd75fd9f14",
-              "sourceModelName": "111_Svc_vPRS"
-            }
-          }
-        }
-      },
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {},
-      "vfModules": {},
-      "volumeGroups": {},
-      "pnfs": {}
-    }
-  }
-
-  function loadMockMembers(): any[] {
-    return [
-      {
-        "action": "None",
-        "instanceName": "VNF1_INSTANCE_NAME",
-        "instanceId": "VNF1_INSTANCE_ID",
-        "orchStatus": null,
-        "productFamilyId": null,
-        "lcpCloudRegionId": "hvf23b",
-        "tenantId": "3e9a20a3e89e45f884e09df0cc2d2d2a",
-        "tenantName": "APPC-24595-T-IST-02C",
-        "modelInfo": {
-          "modelInvariantId": "vnf-instance-model-invariant-id",
-          "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
-          "modelVersion": "2.0",
-          "modelName": "vf_vEPDG",
-          "modelType": "vnf"
-        },
-        "instanceType": "VNF1_INSTANCE_TYPE",
-        "provStatus": null,
-        "inMaint": false,
-        "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
-        "originalName": null,
-        "legacyRegion": null,
-        "lineOfBusiness": null,
-        "platformName": null,
-        "trackById": "7a6ee536-f052-46fa-aa7e-2fca9d674c44:002",
-        "serviceInstanceId": "service-instance-id1",
-        "serviceInstanceName": "service-instance-name"
-      },
-      {
-        "action": "None",
-        "instanceName": "VNF2_INSTANCE_NAME",
-        "instanceId": "VNF2_INSTANCE_ID",
-        "orchStatus": null,
-        "productFamilyId": null,
-        "lcpCloudRegionId": "hvf23b",
-        "tenantId": "3e9a20a3e89e45f884e09df0cc2d2d2a",
-        "tenantName": "APPC-24595-T-IST-02C",
-        "modelInfo": {
-          "modelInvariantId": "vnf-instance-model-invariant-id",
-          "modelVersionId": "eb5f56bf-5855-4e61-bd00-3e19a953bf02",
-          "modelVersion": "1.0",
-          "modelName": "vf_vEPDG",
-          "modelType": "vnf"
-        },
-        "instanceType": "VNF2_INSTANCE_TYPE",
-        "provStatus": null,
-        "inMaint": true,
-        "uuid": "eb5f56bf-5855-4e61-bd00-3e19a953bf02",
-        "originalName": null,
-        "legacyRegion": null,
-        "lineOfBusiness": null,
-        "platformName": null,
-        "trackById": "eb5f56bf-5855-4e61-bd00-3e19a953bf02:003",
-        "serviceInstanceId": "service-instance-id2",
-        "serviceInstanceName": "service-instance-name"
-      }
-    ];
-  }
-
 
 });
index d89f307..2787c61 100644 (file)
@@ -95,9 +95,8 @@ export class VnfGroupingModelInfo implements ILevelNodeInfo {
     return node;
   }
 
-  getModel(modelId: string, instance: any, serviceHierarchy): any {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
-    return new VnfGroupModel(this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, modelId));
+  getModel(instanceModel: any): any {
+    return new VnfGroupModel(instanceModel);
   }
 
   hasMissingData(instance, dynamicInputs: any, isEcompGeneratedNaming: boolean): boolean {
index 0fbbc4a..bc657ae 100644 (file)
@@ -29,7 +29,7 @@ export class VpnModelInfo implements ILevelNodeInfo {
 
   updateDynamicInputsDataFromModel = (currentModel): any => [];
 
-  getModel = (modelId: string, instance: any, serviceHierarchy): any => {
+  getModel = (instanceModel: any): any => {
     return new Level1Model();
   };
 
index 07d4cee..f3e479a 100644 (file)
@@ -32,6 +32,7 @@ describe('Vrf Model Info', () => {
   let _iframeService : IframeService;
   let _networkStepService : NetworkStepService;
   let _vpnStepService : VpnStepService;
+  let _featureFlagsService : FeatureFlagsService;
   let vrfModel: VrfModelInfo;
 
   beforeEach(() => {
@@ -59,11 +60,12 @@ describe('Vrf Model Info', () => {
     _dialogService = injector.get(DialogService);
     _iframeService = injector.get(IframeService);
     _networkStepService = injector.get(NetworkStepService);
+    _featureFlagsService = injector.get(FeatureFlagsService);
     _vpnStepService = injector.get(VpnStepService);
     _store = injector.get(NgRedux);
     _componentInfoService = injector.get(ComponentInfoService);
 
-    vrfModel = new VrfModelInfo(_store,_sharedTreeService, _dialogService, _iframeService, _networkStepService, _vpnStepService);
+    vrfModel = new VrfModelInfo(_store,_sharedTreeService, _dialogService, _iframeService, _featureFlagsService, _networkStepService, _vpnStepService);
 
   });
 
@@ -94,9 +96,16 @@ describe('Vrf Model Info', () => {
 
 
   test('getModel should return VRF model with min and max are equal to 1 (hard coded)', () => {
-    let model: VrfModel = vrfModel.getModel('VRF Entry Configuration 0', <any>{
-      originalName : 'VRF Entry Configuration 0'
-    }, getServiceHierarchy());
+    let model: VrfModel = vrfModel.getModel({
+        "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
+        "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
+        "properties": {
+          "ecomp_generated_naming": "false",
+          "type": "VRF-ENTRY",
+        },
+        "type": "Configuration"
+      }
+    );
     expect(model.properties['type']).toEqual('VRF-ENTRY');
     expect(model.min).toEqual(1);
     expect(model.max).toEqual(1);
@@ -159,80 +168,5 @@ describe('Vrf Model Info', () => {
     };
   }
 
-  function getServiceHierarchy() {
-    return {
-      "service": {
-        "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
-        "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
-        "name": "infraVPN",
-        "version": "1.0",
-        "toscaModelURL": null,
-        "category": "Network Service",
-        "serviceType": "BONDING",
-        "serviceRole": "INFRASTRUCTURE-VPN",
-        "description": "ddd",
-        "serviceEcompNaming": "true",
-        "instantiationType": "A-La-Carte",
-        "inputs": {},
-        "vidNotions": {
-          "instantiationUI": "macroService",
-          "modelCategory": "other",
-          "viewEditUI": "legacy"
-        }
-      },
-      "vnfs": {},
-      "networks": {},
-      "collectionResources": {},
-      "configurations": {},
-      "fabricConfigurations": {},
-      "serviceProxies": {
-        "misvpn_service_proxy 0": {
-          "uuid": "35186eb0-e6b6-4fa5-86bb-1501b342a7b1",
-          "invariantUuid": "73f89e21-b96c-473f-8884-8b93bcbd2f76",
-          "description": "A Proxy for Service MISVPN_SERVICE",
-          "name": "MISVPN_SERVICE Service Proxy",
-          "version": "3.0",
-          "customizationUuid": "4c2fb7e0-a0a5-4b32-b6ed-6a974e55d923",
-          "inputs": {},
-          "commands": {},
-          "properties": {
-            "ecomp_generated_naming": "false"
-          },
-          "type": "Service Proxy",
-          "sourceModelUuid": "d5cc7d15-c842-450e-95ae-2a69e66dd23b",
-          "sourceModelInvariant": "c126ec86-59fe-48c0-9532-e39a9b3e5272",
-          "sourceModelName": "MISVPN_SERVICE"
-        }
-      },
-      "vfModules": {},
-      "volumeGroups": {},
-      "pnfs": {},
-      "vnfGroups": {},
-      "vrfs": {
-        "VRF Entry Configuration 0": {
-          "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
-          "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
-          "description": "VRF Entry configuration object",
-          "name": "VRF Entry Configuration",
-          "version": "30.0",
-          "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433",
-          "inputs": {},
-          "commands": {},
-          "properties": {
-            "ecomp_generated_naming": "false",
-            "type": "VRF-ENTRY",
-            "role": "INFRASTRUCTURE-CLOUD-VPN"
-          },
-          "type": "Configuration",
-          "modelCustomizationName": "VRF Entry Configuration 0",
-          "sourceNodes": [],
-          "collectorNodes": null,
-          "configurationByPolicy": false
-        }
-      }
-    }
-  }
-
-
 
 })
index 7b7437c..53985d0 100644 (file)
@@ -3,7 +3,6 @@ import {ComponentInfoType} from "../../../component-info/component-info-model";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
 import {ModelInformationItem} from "../../../../../shared/components/model-information/model-information.component";
-import {VrfInstance} from "../../../../../shared/models/vrfInstance";
 import {VrfTreeNode} from "../../../../../shared/models/vrfTreeNode";
 import {VrfModel} from "../../../../../shared/models/vrfModel";
 import {NgRedux} from "@angular-redux/store";
@@ -50,9 +49,8 @@ export class VrfModelInfo implements ILevelNodeInfo {
 
   updateDynamicInputsDataFromModel = (currentModel): any => [];
 
-  getModel = (vrfModelId: string, instance: VrfInstance, serviceHierarchy): VrfModel => {
-    const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance);
-    return new VrfModel(this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, vrfModelId));
+  getModel = (instanceModel: any): VrfModel => {
+    return new VrfModel(instanceModel);
   };
 
 
@@ -111,7 +109,13 @@ export class VrfModelInfo implements ILevelNodeInfo {
     let counter: number = !_.isNil(this._store.getState().service.serviceInstance[serviceModelId]) ?
       (this._store.getState().service.serviceInstance[serviceModelId].existingVRFCounterMap[node.data.modelUniqueId] || 0) : 0;
     counter -= this._sharedTreeService.getExistingInstancesWithDeleteMode(node, serviceModelId, 'vrfs');
-    const model = node.data.getModel(node.data.name, node.data, serviceHierarchy);
+
+    const instanceModel = this._sharedTreeService.modelByIdentifiers(
+      serviceHierarchy, node.data.modelTypeName,
+      this._sharedTreeService.modelUniqueNameOrId(node.data), node.data.name
+    );
+
+    const model = node.data.getModel(instanceModel);
     const maxInstances: number = model.max;
     const isReachedLimit = !(maxInstances > counter);
     const showAddIcon = this._sharedTreeService.shouldShowAddIcon() && !isReachedLimit;
index 1ba9a23..69d530d 100644 (file)
@@ -2466,7 +2466,6 @@ describe('Model Tree Generator service', () => {
           "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
           "platformName": "xxx1",
           "lineOfBusiness": "ONAP",
-          "uuid": "network-instance-model-version-id",
           "routeTarget": {
             "globalRouteTarget": "mock-global-1",
             "routeTargetRole": "mock-role-x"
@@ -2596,6 +2595,7 @@ describe('Model Tree Generator service', () => {
         "inMaint": true,
         "name": "2017-388_PASQUALE-vPE 0",
         "modelName": "2017-388_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "parentType": '',
         "isEcompGeneratedNaming": false,
@@ -2623,6 +2623,7 @@ describe('Model Tree Generator service', () => {
         "parentType": '',
         "name": "2017-488_PASQUALE-vPE 0",
         "modelName": "2017-488_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "isEcompGeneratedNaming": false,
         "networkStoreKey": "2017-488_PASQUALE-vPE 0",
@@ -2644,6 +2645,7 @@ describe('Model Tree Generator service', () => {
           "statusMessage": "Failed vfModel message",
           "name": "&lt;Automatically Assigned&gt;",
           "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+          "modelTypeName": "vfModules",
           "type": "VFmodule",
           "isEcompGeneratedNaming": false,
           "dynamicInputs": [],
@@ -2668,6 +2670,7 @@ describe('Model Tree Generator service', () => {
         "id": "o65b26t2thj",
         "name": "2017488_PASQUALEvPE",
         "modelName": "2017-488_PASQUALE-vPE 0",
+        "modelTypeName": "vnfs",
         "type": "VF",
         "isEcompGeneratedNaming": false,
         "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
@@ -2684,6 +2687,7 @@ describe('Model Tree Generator service', () => {
             "missingData": false,
             "name": "yoav",
             "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+            "modelTypeName": "vfModules",
             "type": "VFmodule",
             "isEcompGeneratedNaming": false,
             "typeName": "M",
@@ -2746,6 +2750,7 @@ describe('Model Tree Generator service', () => {
         "routeTargetRole": "mock-role-x",
         "statusMessage": "Network failed message",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0",
@@ -2765,6 +2770,7 @@ describe('Model Tree Generator service', () => {
         "id": "2mdxioxca9h",
         "name": "&lt;Automatically Assigned&gt;",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0:0001",
@@ -2779,6 +2785,7 @@ describe('Model Tree Generator service', () => {
         "id": "z7vd1gmpbs",
         "name": "ExtVL",
         "modelName": "ExtVL 0",
+        "modelTypeName": "networks",
         "type": "VL",
         "isEcompGeneratedNaming": true,
         "networkStoreKey": "ExtVL 0_1",
index 89d901f..13dca56 100644 (file)
@@ -8,10 +8,12 @@ import {ErrorMsgService} from "../../../../shared/components/error-msg/error-msg
 import {FeatureFlagsService, Features} from "../../../../shared/services/featureFlag/feature-flags.service";
 import {NgRedux} from "@angular-redux/store";
 import {AppState} from "../../../../shared/store/reducers";
+import {SharedTreeService} from "../shared.tree.service";
 
 @Injectable()
 export class ObjectToInstanceTreeService {
-  constructor(private _objectToTreeService: ObjectToTreeService, private _errorMsgService: ErrorMsgService, private store: NgRedux<AppState>) {
+  constructor(private _objectToTreeService: ObjectToTreeService, private _errorMsgService: ErrorMsgService,
+              private store: NgRedux<AppState>, private _sharedTreeService: SharedTreeService) {
     this.numberOfFailed = 0;
     this.numberOfElements = 0;
 
@@ -76,7 +78,11 @@ export class ObjectToInstanceTreeService {
    * @param parentType
    ****************************************************************/
   getNodeInstance(modelName: string, parentModel: any, instance: any, serviceHierarchy, option: ILevelNodeInfo, serviceModelId: string, parentType ?: string) {
-    const model = option.getModel(modelName, instance, serviceHierarchy);
+    const instanceModel = this._sharedTreeService.modelByIdentifiers(
+      serviceHierarchy, option.name,
+      this._sharedTreeService.modelUniqueNameOrId(instance), modelName
+    );
+    const model = option.getModel(instanceModel);
 
     let optionalNodes = option.createInstanceTreeNode(instance, model, parentModel, modelName, serviceModelId);
     this.increaseNumberOfFailed(optionalNodes);
@@ -99,6 +105,7 @@ export class ObjectToInstanceTreeService {
       node.parentType = !_.isNil(parentType) ? parentType : "";
       node.updatePoistionFunction = option.updatePosition;
       node.position = option.getNodePosition(instance, node.dynamicModelName);
+      node.modelTypeName = option.name;
       node.getModel = option.getModel.bind(option);
       node.getInfo = !_.isNil(option.getInfo) ? option.getInfo.bind(option) : ()=>{};
       node.componentInfoType = option.componentInfoType;
index ec6f2a4..7fa679b 100644 (file)
@@ -211,6 +211,7 @@ describe('Model Tree Generator service', () => {
       "name": "2017-388_PASQUALE-vPE 1",
       "tooltip": "VF",
       "type": "VF",
+      "modelTypeName": "vnfs",
       "count": 0,
       "max": 1,
       "children": [],
@@ -228,6 +229,7 @@ describe('Model Tree Generator service', () => {
       "name": "2017-388_PASQUALE-vPE 0",
       "tooltip": "VF",
       "type": "VF",
+      "modelTypeName": "vnfs",
       "count": 0,
       "max": 1,
       "children": [],
@@ -243,6 +245,7 @@ describe('Model Tree Generator service', () => {
       "name": "2017-488_PASQUALE-vPE 0",
       "tooltip": "VF",
       "type": "VF",
+      "modelTypeName": "vnfs",
       "count": 0,
       "max": 1,
       "children": [{
@@ -253,6 +256,7 @@ describe('Model Tree Generator service', () => {
         "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
         "tooltip": "VFmodule",
         "type": "VFmodule",
+        "modelTypeName": "vfModules",
         "count": 0,
         "max": 1,
         "children": [],
@@ -268,6 +272,7 @@ describe('Model Tree Generator service', () => {
         "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
         "tooltip": "VFmodule",
         "type": "VFmodule",
+        "modelTypeName": "vfModules",
         "count": 0,
         "max": 1,
         "children": [],
@@ -283,6 +288,7 @@ describe('Model Tree Generator service', () => {
         "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
         "tooltip": "VFmodule",
         "type": "VFmodule",
+        "modelTypeName": "vfModules",
         "count": 0,
         "max": 1,
         "children": [],
index f1ebdaf..c3c8fa1 100644 (file)
@@ -121,11 +121,11 @@ export class ObjectToModelTreeService {
     node.getNodeCount = (node, serviceId) => levelNodeInfo.getNodeCount(node, serviceId);
     node.getMenuAction = (node, serviceId) => levelNodeInfo.getMenuAction(node, serviceId);
     node.showNodeIcons = (node, serviceId) => levelNodeInfo.showNodeIcons(node, serviceId);
-    node.typeName = levelNodeInfo.typeName;
     node.getModel = levelNodeInfo.getModel.bind(levelNodeInfo);
-    node.getInfo = !_.isNil(levelNodeInfo.getInfo) ? levelNodeInfo.getInfo.bind(levelNodeInfo) : () => {
-    };
+    node.getInfo = !_.isNil(levelNodeInfo.getInfo) ? levelNodeInfo.getInfo.bind(levelNodeInfo) : () => {};
     node.componentInfoType = levelNodeInfo.componentInfoType;
+    node.typeName = levelNodeInfo.typeName;
+    node.modelTypeName = levelNodeInfo.name;
     return node;
   }
 }
index 83691cf..964e120 100644 (file)
@@ -19,7 +19,6 @@ import {NodeInstance} from "../../../shared/models/nodeInstance";
 
 @Injectable()
 export class SharedTreeService {
-  private _sharedTreeService: SharedTreeService;
   constructor(private _store: NgRedux<AppState>) {
   }
 
@@ -63,12 +62,12 @@ export class SharedTreeService {
    * @param modelTypeName "vnfs" | "networks" | "vfModules" | "collectionResources" | ...
    * @param modelUniqueNameOrId Either an entry name (i.e. "originalName"), modelCustomizationId or modelInvariantId.
    *                      Note that modelInvariantId will work only where model lacks a modelCustomizationId.
-   * @param modeName An optional entry name (i.e. "originalName"); will not try to use as id
+   * @param modelName An optional entry name (i.e. "originalName"); will not try to use as id
    */
-  modelByIdentifiers = (serviceModelFromHierarchy, modelTypeName: string, modelUniqueNameOrId: string, modeName?: string): any => {
+  modelByIdentifiers = (serviceModelFromHierarchy, modelTypeName: string, modelUniqueNameOrId: string, modelName?: string): any => {
     const logErrorAndReturnUndefined = () =>
       console.info(`modelByIdentifiers: could not find a model matching query`, {
-        modelTypeName, modelUniqueNameOrId, modeName, serviceModelFromHierarchy
+        modelTypeName, modelUniqueNameOrId, modelName, serviceModelFromHierarchy
       });
 
     if (_.isNil(serviceModelFromHierarchy)) return logErrorAndReturnUndefined();
@@ -77,7 +76,7 @@ export class SharedTreeService {
     if (_.isNil(modelsOfType)) return logErrorAndReturnUndefined();
 
     const modelIfModelIdentifierIsEntryName = modelsOfType[modelUniqueNameOrId];
-    const modelIfModeNameExists = _.isNil(modeName) ? null : modelsOfType[modeName];
+    const modelIfModeNameExists = _.isNil(modelName) ? null : modelsOfType[modelName];
 
     if (!_.isNil(modelIfModelIdentifierIsEntryName)) {
       return modelIfModelIdentifierIsEntryName;
@@ -421,7 +420,13 @@ export class SharedTreeService {
     AuditInfoModalComponent.openInstanceAuditInfoModal.next({
       instanceId: serviceModelId,
       type: instanceType,
-      model: modelInfoService.getModel(node.data.modelName, instance, this._store.getState().service.serviceHierarchy[serviceModelId]),
+      model: modelInfoService.getModel(
+        this.modelByIdentifiers(
+          this._store.getState().service.serviceHierarchy[serviceModelId],
+          modelInfoService.name,
+          this.modelUniqueNameOrId(instance), node.data.modelName
+        )
+      ),
       instance
     });
   }