summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-07-07 19:23:03 +0300
committerIttay Stern <ittay.stern@att.com>2019-07-08 16:13:43 +0300
commitf792671ae247a931f34d902e9276202b5016ef9a (patch)
tree6104971e8074c9a3d720836276ff18619719ec02 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree
parentfc62274e8d15964d63c62bf0e2f4abc040252ee9 (diff)
Merge from ecomp 718fd196 - Modern UI
Issue-ID: VID-378 Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree')
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts627
-rw-r--r--vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts53
2 files changed, 353 insertions, 327 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
index fd39ed92a..d3f04fe66 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
@@ -30,6 +30,8 @@ import {DuplicateService} from "../../duplicate/duplicate.service";
import {SdcUiComponentsModule, SdcUiServices} from "onap-ui-angular";
import {ErrorMsgService} from "../../../../shared/components/error-msg/error-msg.service";
import {ComponentInfoService} from "../../component-info/component-info.service";
+import {NetworkStepService} from "../models/vrf/vrfModal/networkStep/network.step.service";
+import {VpnStepService} from "../models/vrf/vrfModal/vpnStep/vpn.step.service";
class MockAppStore<T> {
getState() {
@@ -81,6 +83,8 @@ describe('Model Tree Generator service', () => {
ErrorMsgService,
ComponentInfoService,
SdcUiServices.ModalService,
+ NetworkStepService,
+ VpnStepService,
{ provide: NgRedux, useClass: MockAppStore },
MockNgRedux]
});
@@ -106,14 +110,18 @@ describe('Model Tree Generator service', () => {
delete convertToNodes[0].trackById;
delete convertToNodes[0].updatePoistionFunction;
delete convertToNodes[0].position;
- delete convertToNodes[0].onSelectedNode;
+ delete convertToNodes[0].getInfo;
+ delete convertToNodes[0].componentInfoType;
+ delete convertToNodes[0].getModel;
delete convertToNodes[1].children[0].isFailed;
delete convertToNodes[1].children[0].menuActions;
delete convertToNodes[1].children[0].trackById;
delete convertToNodes[1].children[0].errors;
delete convertToNodes[1].children[0].updatePoistionFunction;
delete convertToNodes[1].children[0].position;
- delete convertToNodes[1].children[0].onSelectedNode;
+ delete convertToNodes[1].children[0].getInfo;
+ delete convertToNodes[1].children[0].getModel;
+ delete convertToNodes[1].children[0].componentInfoType;
expect(Object.assign({}, convertToNodes[0])).toEqual(Object.assign({}, expectInstanceNodesResultVNF()[0]));
expect(Object.assign({}, convertToNodes[1].children[0])).toEqual(Object.assign({}, expectInstanceNodesResultVNF()[1].children[0]));
expect(convertToNodes[1].inMaint).toBeFalsy();
@@ -131,7 +139,9 @@ describe('Model Tree Generator service', () => {
delete convertToNodes[1].isFailed;
delete convertToNodes[1].updatePoistionFunction;
delete convertToNodes[1].position;
- delete convertToNodes[1].onSelectedNode;
+ delete convertToNodes[1].getModel;
+ delete convertToNodes[1].getInfo;
+ delete convertToNodes[1].componentInfoType;
expect(Object.assign({}, convertToNodes[0].children[0].dynamicInputs)).toEqual(Object.assign({}, expectInstanceNodesResultVNF_Network()[0]['children'][0].dynamicInputs));
expect(Object.assign({}, convertToNodes[0].children[0].missingData)).toEqual(Object.assign({}, expectInstanceNodesResultVNF_Network()[0]['children'][0].missingData));
expect(Object.assign({}, convertToNodes[1])).toEqual(Object.assign({}, expectInstanceNodesResultVNF_Network()[1]));
@@ -154,7 +164,7 @@ describe('Model Tree Generator service', () => {
"serviceEcompNaming": "false",
"instantiationType": "Macro",
"inputs": {
- "2017488_adiodvpe0_ASN": {
+ "2017488_pasqualevpe0_ASN": {
"type": "string",
"description": "AV/PE",
"entry_schema": null,
@@ -170,11 +180,11 @@ describe('Model Tree Generator service', () => {
}
},
"vnfs": {
- "2017-388_ADIOD-vPE 1": {
+ "2017-388_PASQUALE-vPE 1": {
"uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
"invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -237,37 +247,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -312,7 +322,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -320,14 +330,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -337,7 +347,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -351,16 +361,16 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_flavor_name": "ns.c20r16d25.v5"
},
"type": "VF",
- "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
"vfModules": {},
"volumeGroups": {},
"vfcInstanceGroups": {}
},
- "2017-388_ADIOD-vPE 0": {
+ "2017-388_PASQUALE-vPE 0": {
"uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
"invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -423,37 +433,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -499,7 +509,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -507,14 +517,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -524,7 +534,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -538,16 +548,16 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_flavor_name": "ns.c20r16d25.v5"
},
"type": "VF",
- "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
"vfModules": {},
"volumeGroups": {},
"vfcInstanceGroups": {}
},
- "2017-488_ADIOD-vPE 0": {
+ "2017-488_PASQUALE-vPE 0": {
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -610,37 +620,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -687,7 +697,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -695,14 +705,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -712,7 +722,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -726,21 +736,21 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_flavor_name": "ns.c20r16d25.v5"
},
"type": "VF",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"baseModule": false
},
"inputs": {
@@ -750,10 +760,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
- "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+ "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
"constraints": null,
"required": true,
"default": "17.2"
@@ -764,10 +774,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
- "fromInputName": "adiodvpe0_bandwidth_units",
+ "fromInputName": "pasqualevpe0_bandwidth_units",
"constraints": null,
"required": true,
"default": "Gbps"
@@ -778,10 +788,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
- "fromInputName": "adiodvpe0_bandwidth",
+ "fromInputName": "pasqualevpe0_bandwidth",
"constraints": null,
"required": true,
"default": "10"
@@ -792,10 +802,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
- "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+ "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
"constraints": null,
"required": true,
"default": "ATLMY8GA"
@@ -806,10 +816,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
- "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+ "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
"constraints": null,
"required": true,
"default": "mtnj309me6"
@@ -817,37 +827,37 @@ describe('Model Tree Generator service', () => {
},
"volumeGroupAllowed": true
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+ "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": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"version": "5",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV",
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
"baseModule": true
},
"inputs": {},
"volumeGroupAllowed": false
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV",
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
"baseModule": false
},
"inputs": {},
@@ -855,19 +865,19 @@ describe('Model Tree Generator service', () => {
}
},
"volumeGroups": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"baseModule": false
},
"inputs": {
@@ -877,10 +887,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
- "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+ "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
"constraints": null,
"required": true,
"default": "17.2"
@@ -891,10 +901,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
- "fromInputName": "adiodvpe0_bandwidth_units",
+ "fromInputName": "pasqualevpe0_bandwidth_units",
"constraints": null,
"required": true,
"default": "Gbps"
@@ -905,10 +915,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
- "fromInputName": "adiodvpe0_bandwidth",
+ "fromInputName": "pasqualevpe0_bandwidth",
"constraints": null,
"required": true,
"default": "10"
@@ -919,10 +929,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
- "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+ "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
"constraints": null,
"required": true,
"default": "ATLMY8GA"
@@ -933,29 +943,29 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
- "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+ "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
"constraints": null,
"required": true,
"default": "mtnj309me6"
}
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV",
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
"baseModule": false
},
"inputs": {}
@@ -965,24 +975,24 @@ describe('Model Tree Generator service', () => {
}
},
"networks": {},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {},
"fabricConfigurations": {},
"serviceProxies": {},
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"baseModule": false
},
"inputs": {
@@ -992,10 +1002,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
- "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+ "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
"constraints": null,
"required": true,
"default": "17.2"
@@ -1006,10 +1016,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
- "fromInputName": "adiodvpe0_bandwidth_units",
+ "fromInputName": "pasqualevpe0_bandwidth_units",
"constraints": null,
"required": true,
"default": "Gbps"
@@ -1020,10 +1030,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
- "fromInputName": "adiodvpe0_bandwidth",
+ "fromInputName": "pasqualevpe0_bandwidth",
"constraints": null,
"required": true,
"default": "10"
@@ -1034,10 +1044,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
- "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+ "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
"constraints": null,
"required": true,
"default": "ATLMY8GA"
@@ -1048,10 +1058,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
- "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+ "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
"constraints": null,
"required": true,
"default": "mtnj309me6"
@@ -1059,37 +1069,37 @@ describe('Model Tree Generator service', () => {
},
"volumeGroupAllowed": true
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+ "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": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"version": "5",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV",
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
"baseModule": true
},
"inputs": {},
"volumeGroupAllowed": false
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV",
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
"baseModule": false
},
"inputs": {},
@@ -1097,19 +1107,19 @@ describe('Model Tree Generator service', () => {
}
},
"volumeGroups": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"baseModule": false
},
"inputs": {
@@ -1119,10 +1129,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
- "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+ "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
"constraints": null,
"required": true,
"default": "17.2"
@@ -1133,10 +1143,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
- "fromInputName": "adiodvpe0_bandwidth_units",
+ "fromInputName": "pasqualevpe0_bandwidth_units",
"constraints": null,
"required": true,
"default": "Gbps"
@@ -1147,10 +1157,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
- "fromInputName": "adiodvpe0_bandwidth",
+ "fromInputName": "pasqualevpe0_bandwidth",
"constraints": null,
"required": true,
"default": "10"
@@ -1161,10 +1171,10 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
- "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+ "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
"constraints": null,
"required": true,
"default": "ATLMY8GA"
@@ -1175,29 +1185,29 @@ describe('Model Tree Generator service', () => {
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
- "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+ "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
"constraints": null,
"required": true,
"default": "mtnj309me6"
}
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV",
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
"baseModule": false
},
"inputs": {}
@@ -1222,7 +1232,7 @@ describe('Model Tree Generator service', () => {
"serviceEcompNaming": "false",
"instantiationType": "A-La-Carte",
"inputs": {
- "2017488_adiodvpe0_ASN": {
+ "2017488_pasqualevpe0_ASN": {
"type": "string",
"description": "AV/PE",
"entry_schema": null,
@@ -1234,11 +1244,11 @@ describe('Model Tree Generator service', () => {
}
},
"vnfs": {
- "2017-388_ADIOD-vPE 1": {
+ "2017-388_PASQUALE-vPE 1": {
"uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
"invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -1301,37 +1311,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -1376,7 +1386,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -1384,14 +1394,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -1401,7 +1411,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -1416,16 +1426,16 @@ describe('Model Tree Generator service', () => {
"max_instances": 5
},
"type": "VF",
- "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
"vfModules": {},
"volumeGroups": {},
"vfcInstanceGroups": {}
},
- "2017-388_ADIOD-vPE 0": {
+ "2017-388_PASQUALE-vPE 0": {
"uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
"invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -1488,37 +1498,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -1564,7 +1574,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -1572,14 +1582,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -1589,7 +1599,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -1603,16 +1613,16 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_flavor_name": "ns.c20r16d25.v5"
},
"type": "VF",
- "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
"vfModules": {},
"volumeGroups": {},
"vfcInstanceGroups": {}
},
- "2017-488_ADIOD-vPE 0": {
+ "2017-488_PASQUALE-vPE 0": {
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
- "description": "Name ADIOD vPE Description The provider edge function for the ADIOD 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_ADIOD-vPE",
+ "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": {
@@ -1675,37 +1685,37 @@ describe('Model Tree Generator service', () => {
"vnf_config_template_version": {
"displayName": "vnf_config_template_version",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+ "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
},
"bandwidth_units": {
"displayName": "bandwidth_units",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth_units"
+ "inputName": "pasqualevpe0_bandwidth_units"
},
"bandwidth": {
"displayName": "bandwidth",
"command": "get_input",
- "inputName": "adiodvpe0_bandwidth"
+ "inputName": "pasqualevpe0_bandwidth"
},
"AIC_CLLI": {
"displayName": "AIC_CLLI",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_AIC_CLLI"
+ "inputName": "2017488_pasqualevpe0_AIC_CLLI"
},
"ASN": {
"displayName": "ASN",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_ASN"
+ "inputName": "2017488_pasqualevpe0_ASN"
},
"vnf_instance_name": {
"displayName": "vnf_instance_name",
"command": "get_input",
- "inputName": "2017488_adiodvpe0_vnf_instance_name"
+ "inputName": "2017488_pasqualevpe0_vnf_instance_name"
}
},
"properties": {
"vmxvre_retype": "RE-VMX",
- "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+ "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",
@@ -1752,7 +1762,7 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
"vmxvre_int_ctl_ip_0": "10.0.0.10",
"ecomp_generated_naming": "false",
- "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+ "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
"vnf_name": "mtnj309me6vre",
"vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
"vmxvre_volume_type_1": "HITACHI",
@@ -1760,14 +1770,14 @@ describe('Model Tree Generator service', () => {
"vmxvre_volume_type_0": "HITACHI",
"vmxvpfe_volume_type_0": "HITACHI",
"vmxvpfe_sriov43_0_port_broadcastallow": "true",
- "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+ "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
"vnf_id": "123",
"vmxvre_oam_prefix": "24",
"availability_zone_0": "mtpocfo-kvm-az01",
- "ASN": "get_input:2017488_adiodvpe0_ASN",
+ "ASN": "get_input:2017488_pasqualevpe0_ASN",
"vmxvre_chassis_i2cid": "161",
"vmxvpfe_name_0": "vPFEXI",
- "bandwidth": "get_input:adiodvpe0_bandwidth",
+ "bandwidth": "get_input:pasqualevpe0_bandwidth",
"availability_zone_max_count": "1",
"vmxvre_volume_size_0": "45.0",
"vmxvre_volume_size_1": "50.0",
@@ -1777,7 +1787,7 @@ describe('Model Tree Generator service', () => {
"vmxvre_ore_present": "0",
"vmxvre_volume_name_0": "vREXI_FBVolume",
"vmxvre_type": "0",
- "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+ "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",
@@ -1791,82 +1801,82 @@ describe('Model Tree Generator service', () => {
"vmxvpfe_flavor_name": "ns.c20r16d25.v5"
},
"type": "VF",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "PASQUALE_vRE_BV"
},
"inputs": {
- "adiodvpe0_bandwidth": {
+ "pasqualevpe0_bandwidth": {
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
"constraints": null,
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "2017488_pasqualevpe0_vnf_instance_name": {
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
"constraints": null,
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "2017488_pasqualevpe0_vnf_config_template_version": {
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
"constraints": null,
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "2017488_pasqualevpe0_AIC_CLLI": {
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
"constraints": null,
"required": true,
"default": "ATLMY8GA"
},
- "adiodvpe0_bandwidth_units": {
+ "pasqualevpe0_bandwidth_units": {
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
"constraints": null,
@@ -1876,116 +1886,116 @@ describe('Model Tree Generator service', () => {
},
"volumeGroupAllowed": true
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+ "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": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"version": "5",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV"
+ "vfModuleLabel": "PASQUALE_base_vPE_BV"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "PASQUALE_vPFE_BV"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "PASQUALE_vRE_BV"
},
"inputs": {
- "adiodvpe0_bandwidth": {
+ "pasqualevpe0_bandwidth": {
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
"constraints": null,
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "2017488_pasqualevpe0_vnf_instance_name": {
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
"constraints": null,
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "2017488_pasqualevpe0_vnf_config_template_version": {
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
"constraints": null,
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "2017488_pasqualevpe0_AIC_CLLI": {
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
"constraints": null,
"required": true,
"default": "ATLMY8GA"
},
- "adiodvpe0_bandwidth_units": {
+ "pasqualevpe0_bandwidth_units": {
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
"constraints": null,
@@ -1994,19 +2004,19 @@ describe('Model Tree Generator service', () => {
}
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "PASQUALE_vPFE_BV"
},
"inputs": {}
}
@@ -2093,85 +2103,85 @@ describe('Model Tree Generator service', () => {
"modelCustomizationName": "ExtVL 0"
}
},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {},
"fabricConfigurations": {},
"serviceProxies": {},
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+ "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": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "PASQUALE_vRE_BV"
},
"inputs": {
- "adiodvpe0_bandwidth": {
+ "pasqualevpe0_bandwidth": {
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth"
},
"constraints": null,
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "2017488_pasqualevpe0_vnf_instance_name": {
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_instance_name"
},
"constraints": null,
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "2017488_pasqualevpe0_vnf_config_template_version": {
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "vnf_config_template_version"
},
"constraints": null,
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "2017488_pasqualevpe0_AIC_CLLI": {
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "AIC_CLLI"
},
"constraints": null,
"required": true,
"default": "ATLMY8GA"
},
- "adiodvpe0_bandwidth_units": {
+ "pasqualevpe0_bandwidth_units": {
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
"inputProperties": {
"sourceType": "HEAT",
- "vfModuleLabel": "ADIOD_vRE_BV",
+ "vfModuleLabel": "PASQUALE_vRE_BV",
"paramName": "bandwidth_units"
},
"constraints": null,
@@ -2181,36 +2191,36 @@ describe('Model Tree Generator service', () => {
},
"volumeGroupAllowed": true
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+ "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": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"version": "5",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV"
+ "vfModuleLabel": "PASQUALE_base_vPE_BV"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+ "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": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"version": "6",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "PASQUALE_vPFE_BV"
},
"inputs": {},
"volumeGroupAllowed": true
@@ -2222,17 +2232,17 @@ describe('Model Tree Generator service', () => {
function getInstanceServiceVNF() {
return {
"vnfs": {
- "2017-388_ADIOD-vPE 0": {
+ "2017-388_PASQUALE-vPE 0": {
"action": 'None',
"inMaint": true,
"orchStatus": "Active",
"provStatus": "prov",
"rollbackOnFailure": "true",
- "originalName": "2017-388_ADIOD-vPE 0",
+ "originalName": "2017-388_PASQUALE-vPE 0",
"isMissingData": true,
"trackById": "u5mtsvzmq6p",
"vfModules": {},
- "vnfStoreKey": "2017-388_ADIOD-vPE 0",
+ "vnfStoreKey": "2017-388_PASQUALE-vPE 0",
"uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
"productFamilyId": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
"lcpCloudRegionId": null,
@@ -2244,21 +2254,21 @@ describe('Model Tree Generator service', () => {
"modelType": "VF",
"modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
"modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
- "modelName": "2017-388_ADIOD-vPE",
+ "modelName": "2017-388_PASQUALE-vPE",
"modelVersion": "4.0",
- "modelCustomizationName": "2017-388_ADIOD-vPE 0"
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0"
}
},
- "2017-488_ADIOD-vPE 0": {
+ "2017-488_PASQUALE-vPE 0": {
"action": 'None',
"inMaint": false,
"rollbackOnFailure": "true",
- "originalName": "2017-488_ADIOD-vPE 0",
+ "originalName": "2017-488_PASQUALE-vPE 0",
"isMissingData": false,
"trackById": "1d6dg4fsgbm",
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0zssmp": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0zssmp": {
"action": 'None',
"isMissingData": true,
"sdncPreReload": null,
@@ -2266,11 +2276,11 @@ describe('Model Tree Generator service', () => {
"modelType": "VFmodule",
"modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
"modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
- "modelName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"modelVersion": "5",
"modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
"modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
},
"instanceParams": [
{}
@@ -2280,24 +2290,24 @@ describe('Model Tree Generator service', () => {
}
}
},
- "vnfStoreKey": "2017-488_ADIOD-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"productFamilyId": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
- "lcpCloudRegionId": "JANET25",
+ "lcpCloudRegionId": "AAIAIC25",
"tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
"lineOfBusiness": "ONAP",
"platformName": "platform",
"modelInfo": {
"modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
"modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
- "modelName": "2017-488_ADIOD-vPE",
+ "modelName": "2017-488_PASQUALE-vPE",
"modelVersion": "5.0",
"modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
"modelUniqueId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
},
- "instanceName": "2017488_ADIODvPE",
+ "instanceName": "2017488_PASQUALEvPE",
"legacyRegion": "123",
"instanceParams": [
{}
@@ -2306,7 +2316,7 @@ describe('Model Tree Generator service', () => {
},
"instanceParams": [
{
- "2017488_adiodvpe0_ASN": "AV_vPE"
+ "2017488_pasqualevpe0_ASN": "AV_vPE"
}
],
"validationCounter": 3,
@@ -2324,7 +2334,7 @@ describe('Model Tree Generator service', () => {
"subscriptionServiceType": "TYLER SILVIA",
"owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
"productFamilyId": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
- "lcpCloudRegionId": "JANET25",
+ "lcpCloudRegionId": "AAIAIC25",
"tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
"aicZoneId": "ABC15",
"projectName": "WATKINS",
@@ -2358,43 +2368,43 @@ describe('Model Tree Generator service', () => {
function getInstanceServiceVNF_Network() {
return {
"vnfs": {
- "2017-488_ADIOD-vPE 0": {
+ "2017-488_PASQUALE-vPE 0": {
"action": 'None',
"rollbackOnFailure": "true",
- "originalName": "2017-488_ADIOD-vPE 0",
+ "originalName": "2017-488_PASQUALE-vPE 0",
"isMissingData": false,
"trackById": "o65b26t2thj",
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1sgoqi": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1sgoqi": {
"action": 'None',
"instanceName": "yoav",
"volumeGroupName": "123",
"modelInfo": {
"modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
"modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
- "modelName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"modelVersion": "6",
"modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
"modelUniqueId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
},
"uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
"isMissingData": false,
"instanceParams": [
{
- "adiodvpe0_bandwidth": "10",
- "2017488_adiodvpe0_vnf_instance_name": "mtnj309me6",
- "2017488_adiodvpe0_vnf_config_template_version": "17.2",
- "2017488_adiodvpe0_AIC_CLLI": "ATLMY8GA",
- "adiodvpe0_bandwidth_units": "Gbps"
+ "pasqualevpe0_bandwidth": "10",
+ "2017488_pasqualevpe0_vnf_instance_name": "mtnj309me6",
+ "2017488_pasqualevpe0_vnf_config_template_version": "17.2",
+ "2017488_pasqualevpe0_AIC_CLLI": "ATLMY8GA",
+ "pasqualevpe0_bandwidth_units": "Gbps"
}
]
}
}
},
- "vnfStoreKey": "2017-488_ADIOD-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
"lcpCloudRegionId": "hvf6",
@@ -2404,13 +2414,13 @@ describe('Model Tree Generator service', () => {
"modelInfo": {
"modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
"modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
- "modelName": "2017-488_ADIOD-vPE",
+ "modelName": "2017-488_PASQUALE-vPE",
"modelVersion": "5.0",
"modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
},
- "instanceName": "2017488_ADIODvPE",
+ "instanceName": "2017488_PASQUALEvPE",
"instanceParams": [
{}
]
@@ -2418,7 +2428,7 @@ describe('Model Tree Generator service', () => {
},
"instanceParams": [
{
- "2017488_adiodvpe0_ASN": "AV_vPE"
+ "2017488_pasqualevpe0_ASN": "AV_vPE"
}
],
"validationCounter": 0,
@@ -2448,6 +2458,11 @@ 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"
+ },
"instanceParams": [
{}
],
@@ -2528,7 +2543,7 @@ describe('Model Tree Generator service', () => {
"subscriptionServiceType": "TYLER SILVIA",
"owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
"productFamilyId": "17cc1042-527b-11e6-beb8-9e71128cae77",
- "lcpCloudRegionId": "JANET25",
+ "lcpCloudRegionId": "AAIAIC25",
"tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
"aicZoneId": "JAG1",
"projectName": null,
@@ -2571,13 +2586,13 @@ describe('Model Tree Generator service', () => {
"orchStatus": 'Active',
"provStatus": 'prov',
"inMaint": true,
- "name": "2017-388_ADIOD-vPE 0",
- "modelName": "2017-388_ADIOD-vPE 0",
+ "name": "2017-388_PASQUALE-vPE 0",
+ "modelName": "2017-388_PASQUALE-vPE 0",
"type": "VF",
"parentType": '',
"isEcompGeneratedNaming": false,
- "networkStoreKey": "2017-388_ADIOD-vPE 0",
- "vnfStoreKey": "2017-388_ADIOD-vPE 0",
+ "networkStoreKey": "2017-388_PASQUALE-vPE 0",
+ "vnfStoreKey": "2017-388_PASQUALE-vPE 0",
"typeName": "VNF",
"children": [],
"statusMessage": "Failed Vnf Message",
@@ -2598,12 +2613,12 @@ describe('Model Tree Generator service', () => {
"id": "1d6dg4fsgbm",
"inMaint": false,
"parentType": '',
- "name": "2017-488_ADIOD-vPE 0",
- "modelName": "2017-488_ADIOD-vPE 0",
+ "name": "2017-488_PASQUALE-vPE 0",
+ "modelName": "2017-488_PASQUALE-vPE 0",
"type": "VF",
"isEcompGeneratedNaming": false,
- "networkStoreKey": "2017-488_ADIOD-vPE 0",
- "vnfStoreKey": "2017-488_ADIOD-vPE 0",
+ "networkStoreKey": "2017-488_PASQUALE-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
"typeName": "VNF",
"statusProperties": [Object({
key: 'Prov Status:',
@@ -2620,11 +2635,11 @@ describe('Model Tree Generator service', () => {
"id": "v2egx1b8i1l",
"statusMessage": "Failed vfModel message",
"name": "&lt;Automatically Assigned&gt;",
- "modelName": "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"type": "VFmodule",
"isEcompGeneratedNaming": false,
"dynamicInputs": [],
- "dynamicModelName": "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0zssmp",
+ "dynamicModelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0zssmp",
"typeName": "M",
"statusProperties": [Object({
key: 'Prov Status:',
@@ -2643,11 +2658,11 @@ describe('Model Tree Generator service', () => {
"modelId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"missingData": false,
"id": "o65b26t2thj",
- "name": "2017488_ADIODvPE",
- "modelName": "2017-488_ADIOD-vPE 0",
+ "name": "2017488_PASQUALEvPE",
+ "modelName": "2017-488_PASQUALE-vPE 0",
"type": "VF",
"isEcompGeneratedNaming": false,
- "vnfStoreKey": "2017-488_ADIOD-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
"typeName": "VNF",
"statusProperties": [Object({
key: 'Prov Status:',
@@ -2660,53 +2675,53 @@ describe('Model Tree Generator service', () => {
"modelId": "25284168-24bb-4698-8cb4-3f509146eca5",
"missingData": false,
"name": "yoav",
- "modelName": "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+ "modelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
"type": "VFmodule",
"isEcompGeneratedNaming": false,
"typeName": "M",
"dynamicInputs": [
{
- "id": "adiodvpe0_bandwidth",
+ "id": "pasqualevpe0_bandwidth",
"type": "string",
- "name": "adiodvpe0_bandwidth",
+ "name": "pasqualevpe0_bandwidth",
"value": "10",
"isRequired": true,
"description": "Requested VPE bandwidth"
},
{
- "id": "2017488_adiodvpe0_vnf_instance_name",
+ "id": "2017488_pasqualevpe0_vnf_instance_name",
"type": "string",
- "name": "2017488_adiodvpe0_vnf_instance_name",
+ "name": "2017488_pasqualevpe0_vnf_instance_name",
"value": "mtnj309me6",
"isRequired": true,
"description": "The hostname assigned to the vpe."
},
{
- "id": "2017488_adiodvpe0_vnf_config_template_version",
+ "id": "2017488_pasqualevpe0_vnf_config_template_version",
"type": "string",
- "name": "2017488_adiodvpe0_vnf_config_template_version",
+ "name": "2017488_pasqualevpe0_vnf_config_template_version",
"value": "17.2",
"isRequired": true,
"description": "VPE Software Version"
},
{
- "id": "2017488_adiodvpe0_AIC_CLLI",
+ "id": "2017488_pasqualevpe0_AIC_CLLI",
"type": "string",
- "name": "2017488_adiodvpe0_AIC_CLLI",
+ "name": "2017488_pasqualevpe0_AIC_CLLI",
"value": "ATLMY8GA",
"isRequired": true,
"description": "AIC Site CLLI"
},
{
- "id": "adiodvpe0_bandwidth_units",
+ "id": "pasqualevpe0_bandwidth_units",
"type": "string",
- "name": "adiodvpe0_bandwidth_units",
+ "name": "pasqualevpe0_bandwidth_units",
"value": "Gbps",
"isRequired": true,
"description": "Units of bandwidth"
}
],
- "dynamicModelName": "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1sgoqi"
+ "dynamicModelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1sgoqi"
}
]
},
@@ -2719,6 +2734,8 @@ describe('Model Tree Generator service', () => {
"missingData": false,
"id": "sf3zth68xjf",
"name": "&lt;Automatically Assigned&gt;",
+ "routeTargetId": "mock-global-1",
+ "routeTargetRole": "mock-role-x",
"statusMessage": "Network failed message",
"modelName": "ExtVL 0",
"type": "VL",
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts
index 1fc439ea3..7a908b7fd 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts
@@ -48,7 +48,7 @@ export class ObjectToInstanceTreeService {
* @param node - the current node
****************************************************************/
increaseNumberOfFailed(node) {
- if (node.isFailed) {
+ if (node && node.isFailed) {
this.numberOfFailed++;
node['errors'] = !_.isNil(node['errors']) ? node['errors'] : {};
node['errors']["isFailed"] = true;
@@ -92,11 +92,16 @@ export class ObjectToInstanceTreeService {
}
addingExtraDataToNode(node, modelName: string, parentModel: any, instance: any, serviceHierarchy, option: ILevelNodeInfo, parentType ?: string) {
- node.trackById = _.isNil(node.trackById) ? DefaultDataGeneratorService.createRandomTrackById() : node['trackById'];
- node.parentType = !_.isNil(parentType) ? parentType : "";
- node.updatePoistionFunction = option.updatePosition;
- node.position = option.getNodePosition(instance, node.dynamicModelName);
- node.onSelectedNode = option.onSelectedNode;
+ if(!_.isNil(node)){
+ node.trackById = _.isNil(node.trackById) ? DefaultDataGeneratorService.createRandomTrackById() : node['trackById'];
+ node.parentType = !_.isNil(parentType) ? parentType : "";
+ node.updatePoistionFunction = option.updatePosition;
+ node.position = option.getNodePosition(instance, node.dynamicModelName);
+ node.getModel = option.getModel.bind(option);
+ node.getInfo = !_.isNil(option.getInfo) ? option.getInfo.bind(option) : ()=>{};
+ node.componentInfoType = option.componentInfoType;
+ }
+
return node;
}
@@ -116,24 +121,27 @@ export class ObjectToInstanceTreeService {
* @param serviceHierarchy - The service Hierarchy store
****************************************************************/
addNextInstanceTreeNode(parentInstance, parentModel, levelNodeInfo: ILevelNodeInfo, parentNode, serviceHierarchy): any[] {
- if (!_.isNil(levelNodeInfo.childName)) {
+ if (!_.isNil(levelNodeInfo.childNames)&& levelNodeInfo.childNames.length > 0) {
+ const that = this;
parentNode.children = [];
- if (!_.isNil(parentInstance[levelNodeInfo.childName])) {
- let parentType = levelNodeInfo.type;
- let nextLevelNodeInfo = levelNodeInfo.getNextLevelObject.apply(this);
- Object.keys(parentInstance[levelNodeInfo.childName]).map((modelName) => {
- let nextLevelInstance = parentInstance[levelNodeInfo.childName][modelName];
- let nodes: any[] | any = this.getNodeInstance(modelName, parentModel, nextLevelInstance, serviceHierarchy, nextLevelNodeInfo, parentType);
- if (_.isArray(nodes)) {
- parentNode.children = parentNode.children.concat(nodes);
- } else {
- parentNode.children.push(nodes);
- }
- });
- return this.sortElementsByPosition(parentNode.children);
- }
+ levelNodeInfo.childNames.forEach(function (childName) {
+ if (!_.isNil(parentInstance[childName])) {
+ let parentType = levelNodeInfo.type;
+ let nextLevelNodeInfo = levelNodeInfo.getNextLevelObject.apply(that, [childName]);
+ Object.keys(parentInstance[childName]).map((modelName) => {
+ let nextLevelInstance = parentInstance[childName][modelName];
+ let nodes: any[] | any = that.getNodeInstance(modelName, parentModel, nextLevelInstance, serviceHierarchy, nextLevelNodeInfo, parentType);
+ if (_.isArray(nodes)) {
+ parentNode.children = parentNode.children.concat(nodes);
+ } else {
+ parentNode.children.push(nodes);
+ }
+ });
+ }
+ });
+ return this.sortElementsByPosition(parentNode.children);
}
- return parentNode.children;
+ return !_.isNil(parentNode) ? parentNode.children : null;
}
@@ -142,6 +150,7 @@ export class ObjectToInstanceTreeService {
* @param node
*********************************************************************************/
updateScalingPolicy(node): void {
+ if(_.isNil(node)) return node;
node['errors'] = !_.isNil(node['errors']) ? node['errors'] : {};
if (!_.isNil(node['limitMembers']) && !_.isNil(node.children)) {
let effectiveChildren = (node.children).filter(child => [