aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/shared/services
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/shared/services
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/shared/services')
-rw-r--r--vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts230
-rw-r--r--vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts272
-rw-r--r--vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts81
-rw-r--r--vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts1
4 files changed, 234 insertions, 350 deletions
diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
index 9f19f6259..5cff00b7e 100644
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
@@ -65,10 +65,10 @@ describe("AaiService", () => {
aaiService.retrieveServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType).subscribe((result: ServiceInstance) => {
expect(result.instanceName).toEqual("mCaNkinstancename");
expect(result.modelInavariantId).toEqual("6b528779-44a3-4472-bdff-9cd15ec93450");
- expect(result.vnfs["2017-388_ADIOD-vPE 0"].instanceName).toEqual("2017388_ADIODvPEmCaNkinstanceName");
- expect(result.vnfs["2017-488_ADIOD-vPE 0"].
- vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]
- ["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].instanceName
+ expect(result.vnfs["2017-388_PASQUALE-vPE 0"].instanceName).toEqual("2017388_PASQUALEvPEmCaNkinstanceName");
+ expect(result.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"].instanceName
).toEqual("VFinstancenameZERO");
});
@@ -88,10 +88,10 @@ describe("AaiService", () => {
aaiService.retrieveServiceInstanceRetryTopology(jobId).subscribe((result: ServiceInstance) => {
expect(result.instanceName).toEqual("mCaNkinstancename");
expect(result.modelInavariantId).toEqual("6b528779-44a3-4472-bdff-9cd15ec93450");
- expect(result.vnfs["2017-388_ADIOD-vPE 0"].instanceName).toEqual("2017388_ADIODvPEmCaNkinstanceName");
- expect(result.vnfs["2017-488_ADIOD-vPE 0"].
- vfModules["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0"]
- ["2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot"].instanceName
+ expect(result.vnfs["2017-388_PASQUALE-vPE 0"].instanceName).toEqual("2017388_PASQUALEvPEmCaNkinstanceName");
+ expect(result.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"].instanceName
).toEqual("VFinstancenameZERO");
});
@@ -104,9 +104,9 @@ describe("AaiService", () => {
describe('# get optional group members tests', () =>{
test('aai service get getOptionalGroupMembers and return list of VnfMember', () => {
jest.spyOn(store, 'dispatch');
- jest.spyOn(store, 'getState').mockReturnValue({
+ jest.spyOn(store, 'getState').mockReturnValue( <any>{
service :{
- serviceInstance : {
+ serviceInstance :{
"serviceModelId" : {
optionalGroupMembersMap : {}
}
@@ -132,6 +132,24 @@ describe("AaiService", () => {
req.flush(mockedResult);
});
});
+
+
+ describe('# get active networks', () =>{
+ test('aai service get active networks', () => {
+ const mockedResult = getMockActiveNetworks();
+ const cloudRegion: string = "cloudRegion";
+ const tenantId: string = "tenantId";
+ aaiService.retrieveActiveNetwork(cloudRegion, tenantId).subscribe((res)=>{
+ expect(res.length).toEqual(mockedResult.length);
+ });
+
+ const req = httpMock.expectOne(`${Constants.Path.AAI_GET_ACTIVE_NETWORKS_PATH}?cloudRegion=${cloudRegion}&tenantId=${tenantId}`);
+ expect(req.request.method).toEqual('GET');
+ req.flush(mockedResult);
+ });
+ });
+
+
describe('#cloud owner tests', () => {
let featureFlagToLcpRegionName = [
['aai service extract lcpRegion, flag is true=> lcp region include cloud owner', true, 'id (OWNER)' ],
@@ -158,38 +176,38 @@ describe("AaiService", () => {
function getTopology() {
return {
"vnfs": {
- "2017-388_ADIOD-vPE 0": {
+ "2017-388_PASQUALE-vPE 0": {
"vfModules": {},
"uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
"productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
- "lcpCloudRegionId": "JANET25",
+ "lcpCloudRegionId": "AAIAIC25",
"tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
"lineOfBusiness": "ONAP",
"platformName": "platform",
"modelInfo": {
"modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
"modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
- "modelName": "2017-388_ADIOD-vPE",
+ "modelName": "2017-388_PASQUALE-vPE",
"modelVersion": "4.0",
"modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
- "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
"uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
},
- "instanceName": "2017388_ADIODvPEmCaNkinstanceName",
+ "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
"legacyRegion": "some legacy region"
},
- "2017-488_ADIOD-vPE 0": {
+ "2017-488_PASQUALE-vPE 0": {
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
"instanceName": "VFinstancenameZERO",
"modelInfo": {
"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",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
},
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
@@ -198,8 +216,8 @@ describe("AaiService", () => {
"inMaint": true
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1fshmc": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
"instanceName": "VFinstancename",
"volumeGroupName": "VFinstancename_vol_abc",
"orchStatus": "Create",
@@ -208,10 +226,10 @@ describe("AaiService", () => {
"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",
- "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"
@@ -220,54 +238,54 @@ describe("AaiService", () => {
},
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
- "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",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
},
"orchStatus": "Created",
"inMaint": false,
- "instanceName": "2017488_ADIODvPEVNFinstancename",
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename",
"legacyRegion": "some legacy region"
},
- "2017-488_ADIOD-vPE 0:0001": {
+ "2017-488_PASQUALE-vPE 0:0001": {
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
"instanceName": "VFinstancenameZERO_001",
"provStatus": "Prov Status",
"inMaint": true,
"modelInfo": {
"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",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
},
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1fshmc": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
"instanceName": "VFinstancename_001",
"volumeGroupName": "VFinstancename_vol_abc_001",
"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",
- "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"
@@ -277,50 +295,50 @@ describe("AaiService", () => {
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
- "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",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
},
- "instanceName": "2017488_ADIODvPEVNFinstancename_001",
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_001",
"legacyRegion": "some legacy region"
},
- "2017-488_ADIOD-vPE 0:0002": {
+ "2017-488_PASQUALE-vPE 0:0002": {
"vfModules": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0uvfot": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
"instanceName": "VFinstancenameZERO_002",
"modelInfo": {
"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",
- "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+ "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
},
"uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
}
},
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
- "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1fshmc": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
"instanceName": "VFinstancename_002",
"volumeGroupName": "VFinstancename_vol_abc_002",
"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",
- "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"
@@ -329,20 +347,20 @@ describe("AaiService", () => {
},
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
"productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
- "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",
- "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
"uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
},
- "instanceName": "2017488_ADIODvPEVNFinstancename_002",
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_002",
"legacyRegion": "some legacy region"
}
},
@@ -380,6 +398,110 @@ describe("AaiService", () => {
}
}
+ function getMockActiveNetworks(){
+ return [
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_1",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 1", "network role 2"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_2",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 1", "network role 3"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_3",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 4", "network role 8"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_4",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: [],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_5",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 6", "network role 1"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_6",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 5"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_7",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 3"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_8",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: ["network role 4"],
+ },
+ {
+ networkInstanceName: "networkInstanceName",
+ instanceVersion: "instanceVersion",
+ networkModel: "networkModel",
+ instanceUUID: "instanceUUID_9",
+ provStatus: "provStatus",
+ orchStatus: "orchStatus",
+ serviceInstanceName: "serviceInstanceName",
+ serviceUUID: "serviceUUID",
+ roles: [],
+ }
+ ]
+ }
+
const getMockMembers = (): any[] => {
return [
{
diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
index 1b102e623..4e7e4dad8 100644
--- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
+++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
@@ -41,7 +41,8 @@ import {updateModel, createServiceInstance} from "../../storeUtil/utils/service/
import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service";
import {VnfMember} from "../../models/VnfMember";
import {setOptionalMembersVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions";
-import {Observable} from "rxjs";
+import {Observable} from "rxjs";import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
+import {VPNModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/vpnStep/vpn.step.model";
@Injectable()
export class AaiService {
@@ -217,7 +218,7 @@ export class AaiService {
};
public static formatCloudOwnerTrailer(cloudOwner: string):string {
- return " ("+ cloudOwner.trim().toLowerCase().replace(/^att-/, "").toUpperCase() + ")";
+ return " ("+ cloudOwner.trim().toLowerCase().replace(/^[^-]*-/, "").toUpperCase() + ")";
}
getServiceTypes = (subscriberId): Observable<ServiceType[]> => {
@@ -235,7 +236,7 @@ export class AaiService {
};
getSubscriberDetails = (subscriberId): Observable<GetSubDetailsResponse> => {
- let pathQuery: string = Constants.Path.AAI_SUB_DETAILS_PATH + subscriberId + Constants.Path.ASSIGN + Math.random();
+ let pathQuery: string = Constants.Path.AAI_SUB_DETAILS_PATH + subscriberId + Constants.Path.ASSIGN + Math.random() + Constants.Path.AAI_OMIT_SERVICE_INSTANCES + true;
if (subscriberId != null) {
return this.http.get<GetSubDetailsResponse>(pathQuery);
@@ -257,6 +258,16 @@ export class AaiService {
return this.http.get<ServiceInstance>(pathQuery);
}
+ public retrieveActiveNetwork(cloudRegion : string, tenantId: string) : Observable<NetworkModalRow[]>{
+ let pathQuery: string = `${Constants.Path.AAI_GET_ACTIVE_NETWORKS_PATH}?cloudRegion=${cloudRegion}&tenantId=${tenantId}`;
+ return this.http.get<NetworkModalRow[]>(pathQuery);
+ }
+
+ public retrieveActiveVPNs() : Observable<VPNModalRow[]>{
+ let pathQuery: string = `${Constants.Path.AAI_GET_VPNS_PATH}`;
+ return this.http.get<VPNModalRow[]>(pathQuery);
+ }
+
public retrieveAndStoreServiceInstanceTopology(serviceInstanceId: string, subscriberId: string, serviceType: string, serviceModeId: string):Observable<ServiceInstance> {
return this.retrieveServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType).do((service:ServiceInstance) => {
this.store.dispatch(createServiceInstance(service, serviceModeId));
@@ -268,257 +279,6 @@ export class AaiService {
let pathQuery: string = `${Constants.Path.SERVICES_RETRY_TOPOLOGY}/${jobId}`;
return this.http.get<ServiceInstance>(pathQuery);
- // return of(
- // <any>{
- // "action": "None",
- // "instanceName": "LXzQMx9clZl7D6ckJ",
- // "instanceId": "service-instance-id",
- // "orchStatus": "GARBAGE DATA",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
- // "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
- // "modelName": "vf_vEPDG",
- // "modelType": "service",
- // "modelVersion": "5.0"
- // },
- // "globalSubscriberId": "global-customer-id",
- // "subscriptionServiceType": "service-instance-type",
- // "owningEntityId": null,
- // "owningEntityName": null,
- // "tenantName": null,
- // "aicZoneId": null,
- // "aicZoneName": null,
- // "projectName": null,
- // "rollbackOnFailure": null,
- // "isALaCarte": false,
- // "vnfs": {
- // "1e918ade-3dc6-4cec-b952-3ff94ed82d1c": {
- // "action": "None",
- // "instanceName": "DgZuxjJy5LMIc3755",
- // "instanceId": "1e918ade-3dc6-4cec-b952-3ff94ed82d1c",
- // "orchStatus": null,
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "vnf-instance-model-invariant-id",
- // "modelVersionId": "vnf-instance-model-version-id",
- // "modelType": "vnf"
- // },
- // "instanceType": "SXDBMhwdR9iO0g1Uv",
- // "provStatus": null,
- // "inMaint": false,
- // "uuid": "vnf-instance-model-version-id",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "1e918ade-3dc6-4cec-b952-3ff94ed82d1c",
- // "vfModules": {},
- // "networks": {
- // "ff464c97-ea9c-4165-996a-fe400499af3e": {
- // "action": "None",
- // "instanceName": "ZI0quzIpu8TNXS7nl",
- // "instanceId": "ff464c97-ea9c-4165-996a-fe400499af3e",
- // "orchStatus": "Assigned",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "network-instance-model-invariant-id",
- // "modelVersionId": "network-instance-model-version-id",
- // "modelType": "network"
- // },
- // "instanceType": "CONTRAIL30_BASIC",
- // "provStatus": "prov",
- // "inMaint": false,
- // "uuid": "network-instance-model-version-id",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "ff464c97-ea9c-4165-996a-fe400499af3e",
- // "isFailed": true
- // },
- // "3e41d57c-8bb4-443e-af02-9f86487ba938": {
- // "action": "None",
- // "instanceName": "0i9asscqSLm7Poeb8",
- // "instanceId": "3e41d57c-8bb4-443e-af02-9f86487ba938",
- // "orchStatus": "Created",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "network-instance-model-invariant-id",
- // "modelVersionId": "network-instance-model-version-id",
- // "modelType": "network"
- // },
- // "instanceType": "CONTRAIL30_BASIC",
- // "provStatus": "prov",
- // "inMaint": false,
- // "uuid": "network-instance-model-version-id",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "3e41d57c-8bb4-443e-af02-9f86487ba938",
- // "isFailed": true
- // }
- // },
- // "isFailed": true
- // },
- // "9a9b2705-c569-4f1b-9a67-13e9f86e6c55": {
- // "isFailed": true,
- // "action": "None",
- // "instanceName": "TFn0SYhrCUs7L3qWS",
- // "instanceId": "9a9b2705-c569-4f1b-9a67-13e9f86e6c55",
- // "orchStatus": null,
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelCustomizationName": "VF_vMee 0",
- // "modelInvariantId": "vnf-instance-model-invariant-id",
- // "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
- // "modelType": "vnf"
- // },
- // "instanceType": "WIT68GUnH34VaGZgp",
- // "provStatus": null,
- // "inMaint": true,
- // "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
- // "originalName": "VF_vMee 0",
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "9a9b2705-c569-4f1b-9a67-13e9f86e6c55",
- // "vfModules": {
- // "vf_vmee0..VfVmee..vmme_vlc..module-1": {
- // "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
- // "action": "None",
- // "instanceName": "ss820f_0918_db",
- // "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
- // "orchStatus": "deleted",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
- // "modelCustomizationId": "b200727a-1bf9-4e7c-bd06-b5f4c9d920b9",
- // "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750",
- // "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
- // "modelType": "vfModule"
- // },
- // "instanceType": null,
- // "provStatus": null,
- // "inMaint": true,
- // "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
- // "originalName": "VfVmee..vmme_vlc..module-1",
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
- // "isBase": false,
- // "volumeGroupName": null,
- // "isFailed": true
- // }
- // },
- // "dc229cd8-c132-4455-8517-5c1787c18b14": {
- // "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": {
- // "action": "None",
- // "instanceName": "ss820f_0918_base",
- // "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
- // "orchStatus": "Assigned",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a",
- // "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de",
- // "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14",
- // "modelType": "vfModule"
- // },
- // "instanceType": null,
- // "provStatus": null,
- // "inMaint": false,
- // "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
- // "isBase": true,
- // "volumeGroupName": null
- // }
- // }
- // },
- // "networks": {}
- // }
- // },
- // "networks": {
- // "e1edb09e-e68b-4ebf-adb8-e2587be56257": {
- // "action": "None",
- // "instanceName": "cNpGlYQDsmrUDK5iG",
- // "instanceId": "e1edb09e-e68b-4ebf-adb8-e2587be56257",
- // "orchStatus": "Created",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "network-instance-model-invariant-id",
- // "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
- // "modelType": "network"
- // },
- // "instanceType": "CONTRAIL30_HIMELGUARD",
- // "provStatus": "preprov",
- // "inMaint": false,
- // "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "e1edb09e-e68b-4ebf-adb8-e2587be56257"
- // },
- // "de4b5203-ad1c-4f2b-8843-5236fb8dc9ba": {
- // "action": "None",
- // "instanceName": "EI9QlSRVK0lon54Cb",
- // "instanceId": "de4b5203-ad1c-4f2b-8843-5236fb8dc9ba",
- // "orchStatus": "Assigned",
- // "productFamilyId": null,
- // "lcpCloudRegionId": null,
- // "tenantId": null,
- // "modelInfo": {
- // "modelInvariantId": "network-instance-model-invariant-id",
- // "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
- // "modelType": "network"
- // },
- // "instanceType": "CONTRAIL30_BASIC",
- // "provStatus": "nvtprov",
- // "inMaint": false,
- // "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
- // "originalName": null,
- // "legacyRegion": null,
- // "lineOfBusiness": null,
- // "platformName": null,
- // "trackById": "de4b5203-ad1c-4f2b-8843-5236fb8dc9ba",
- // "isFailed": true
- // }
- // },
- // "vnfGroups": {},
- // "validationCounter": 0,
- // "existingVNFCounterMap": {
- // "vnf-instance-model-version-id": 1,
- // "d6557200-ecf2-4641-8094-5393ae3aae60": 1
- // },
- // "existingNetworksCounterMap": {
- // "ddc3f20c-08b5-40fd-af72-c6d14636b986": 2
- // },
- // "existingVnfGroupCounterMap": {}
- // }
- // );
-
}
public retrieveAndStoreServiceInstanceRetryTopology(jobId: string, serviceModeId : string):Observable<ServiceInstance> {
@@ -561,7 +321,7 @@ export class AaiService {
"instanceId":"VNF1_INSTANCE_ID",
"orchStatus":null,
"productFamilyId":null,
- "lcpCloudRegionId":"mtn23b",
+ "lcpCloudRegionId":"hvf23b",
"tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
"tenantName":"APPC-24595-T-IST-02C",
"modelInfo":{
@@ -589,7 +349,7 @@ export class AaiService {
"instanceId":"VNF2_INSTANCE_ID",
"orchStatus":null,
"productFamilyId":null,
- "lcpCloudRegionId":"mtn23b",
+ "lcpCloudRegionId":"hvf23b",
"tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
"tenantName":"APPC-24595-T-IST-02C",
"modelInfo":{
diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
index c4ef881f0..a34f2fe20 100644
--- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
@@ -4,6 +4,7 @@ import {NgRedux} from '@angular-redux/store';
import {DefaultDataGeneratorService} from './default.data.generator.service';
import {ServiceNodeTypes} from "../../models/ServiceNodeTypes";
import {VNFModel} from "../../models/vnfModel";
+
class MockAppStore<T> {}
describe('Default Data Generator Service', () => {
@@ -26,8 +27,8 @@ describe('Default Data Generator Service', () => {
test('generateVFModule aLaCarte vf module object should missed data', () => {
const serviceHierarchy = generateServiceHierarchy();
- const vnfUUID: string = 'VF_vMee 0';
- const vnfModuleUUID: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
+ const vnfUUID: string = 'VF_vGeraldine 0';
+ const vnfModuleUUID: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
let result = service.generateVFModule(serviceHierarchy.vnfs[vnfUUID].vfModules[vnfModuleUUID], [], false, true);
expect(result.isMissingData).toBeTruthy();
@@ -35,8 +36,8 @@ describe('Default Data Generator Service', () => {
test('generateVFModule should create vf module object', () => {
const serviceHierarchy = generateServiceHierarchy();
- const vnfUUID: string = 'VF_vMee 0';
- const vnfModuleUUID: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
+ const vnfUUID: string = 'VF_vGeraldine 0';
+ const vnfModuleUUID: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
let result = service.generateVFModule(serviceHierarchy.vnfs[vnfUUID].vfModules[vnfModuleUUID], [], false, false);
@@ -54,7 +55,7 @@ describe('Default Data Generator Service', () => {
test('generateVNFData should create vnf object', () => {
const serviceHierarchy = generateServiceHierarchy();
- const vnfName: string = 'VF_vMee 0';
+ const vnfName: string = 'VF_vGeraldine 0';
const formValues = generateVNFFormValues();
let result = service.generateVNFData(serviceHierarchy, vnfName, formValues, false);
@@ -79,16 +80,16 @@ describe('Default Data Generator Service', () => {
test('get vfModule instance params', () => {
let dynamicInputs = service.updateDynamicInputsVnfDataFromModel(ServiceNodeTypes.VFmodule, generateVFModule());
expect(dynamicInputs).toEqual([{
- 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'
@@ -106,8 +107,8 @@ describe('Default Data Generator Service', () => {
describe('#createNewVfModuleTreeNode', () => {
test('createNewVfModuleTreeNode with isEcompGeneratedNaming instance name not fill - missing data true', () => {
- const vnfModuleUUID: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
- const vfModuleModel = generateServiceHierarchy().vnfs['VF_vMee 0'].vfModules['vf_vmee0..VfVmee..base_vmme..module-0'];
+ const vnfModuleUUID: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
+ const vfModuleModel = generateServiceHierarchy().vnfs['VF_vGeraldine 0'].vfModules['vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0'];
const newVfModule = service.createNewVfModuleTreeNode(<any>{
instanceName: "",
instanceParams: {},
@@ -120,8 +121,8 @@ describe('Default Data Generator Service', () => {
});
test('createNewVfModuleTreeNode without isEcompGeneratedNaming missing data false', () => {
- const vnfModuleUUID: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
- const vfModuleModel = generateServiceHierarchy().vnfs['VF_vMee 0'].vfModules['vf_vmee0..VfVmee..base_vmme..module-0'];
+ const vnfModuleUUID: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
+ const vfModuleModel = generateServiceHierarchy().vnfs['VF_vGeraldine 0'].vfModules['vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0'];
const newVfModule = service.createNewVfModuleTreeNode(<any>{
instanceName: "",
instanceParams: {},
@@ -136,7 +137,7 @@ describe('Default Data Generator Service', () => {
describe('#createNewVnfTreeNode', () => {
test('createNewVnfTreeNode with isEcompGeneratedNaming instance name not filled - missing data true', () => {
- const vnfModel = generateServiceHierarchy().vnfs['VF_vMee 0'];
+ const vnfModel = generateServiceHierarchy().vnfs['VF_vGeraldine 0'];
const newVnf = service.createNewTreeNode({
uuid : '',
instanceName: "",
@@ -152,13 +153,13 @@ describe('Default Data Generator Service', () => {
isMissingData: false,
trackById: Math.random().toString(),
vnfStoreKey: "abc"
- }, new VNFModel(vnfModel),'VF_vMee 0', 'vnfs');
- expect(newVnf.name).toEqual('VF_vMee 0');
+ }, new VNFModel(vnfModel),'VF_vGeraldine 0', 'vnfs');
+ expect(newVnf.name).toEqual('VF_vGeraldine 0');
expect(newVnf.missingData).toEqual(true);
});
test('createNewVnfTreeNode with isEcompGeneratedNaming instance name filled - missing data false', () => {
- const vnfModel = generateServiceHierarchy().vnfs['VF_vMee 0'];
+ const vnfModel = generateServiceHierarchy().vnfs['VF_vGeraldine 0'];
const newVnf = service.createNewTreeNode({
uuid : '',
instanceName: "instanceName",
@@ -174,7 +175,7 @@ describe('Default Data Generator Service', () => {
isMissingData: false,
trackById: Math.random().toString(),
vnfStoreKey: "abc"
- }, vnfModel,'VF_vMee 0', 'vnfs');
+ }, vnfModel,'VF_vGeraldine 0', 'vnfs');
expect(newVnf.name).toEqual("instanceName");
expect(newVnf.missingData).toEqual(false);
});
@@ -184,7 +185,7 @@ describe('Default Data Generator Service', () => {
function generateServiceHierarchy() {
- return JSON.parse('{"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_vMee 0":{"uuid":"d6557200-ecf2-4641-8094-5393ae3aae60","invariantUuid":"4160458e-f648-4b30-a176-43881ffffe9e","description":"VSP_vMee","name":"VF_vMee","version":"2.0","customizationUuid":"91415b44-753d-494c-926a-456a9172bbb9","inputs":{},"commands":{},"properties":{"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","ecomp_generated_naming":"false","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_vMee 0","vfModules":{"vf_vmee0..VfVmee..vmme_vlc..module-1":{"uuid":"522159d5-d6e0-4c2a-aa44-5a542a12a830","invariantUuid":"98a7c88b-b577-476a-90e4-e25a5871e02b","customizationUuid":"55b1be94-671a-403e-a26c-667e9c47d091","description":null,"name":"VfVmee..vmme_vlc..module-1","version":"2","modelCustomizationName":"VfVmee..vmme_vlc..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"vmme_vlc"},"inputs":{},"volumeGroupAllowed":false},"vf_vmee0..VfVmee..vmme_gpb..module-2":{"uuid":"41708296-e443-4c71-953f-d9a010f059e1","invariantUuid":"1cca90b8-3490-495e-87da-3f3e4c57d5b9","customizationUuid":"6add59e0-7fe1-4bc4-af48-f8812422ae7c","description":null,"name":"VfVmee..vmme_gpb..module-2","version":"2","modelCustomizationName":"VfVmee..vmme_gpb..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"vmme_gpb"},"inputs":{},"volumeGroupAllowed":false},"vf_vmee0..VfVmee..base_vmme..module-0":{"uuid":"a27f5cfc-7f12-4f99-af08-0af9c3885c87","invariantUuid":"a6f9e51a-2b35-416a-ae15-15e58d61f36d","customizationUuid":"f8c040f1-7e51-4a11-aca8-acf256cfd861","description":null,"name":"VfVmee..base_vmme..module-0","version":"2","modelCustomizationName":"VfVmee..base_vmme..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"base_vmme"},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"vf_vmee0..VfVmee..base_vmme..module-0":{"uuid":"a27f5cfc-7f12-4f99-af08-0af9c3885c87","invariantUuid":"a6f9e51a-2b35-416a-ae15-15e58d61f36d","customizationUuid":"f8c040f1-7e51-4a11-aca8-acf256cfd861","description":null,"name":"VfVmee..base_vmme..module-0","version":"2","modelCustomizationName":"VfVmee..base_vmme..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"base_vmme"},"inputs":{}}},"vfcInstanceGroups":{}}},"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"}},"collectionResource":{},"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_vmee0..VfVmee..vmme_vlc..module-1":{"uuid":"522159d5-d6e0-4c2a-aa44-5a542a12a830","invariantUuid":"98a7c88b-b577-476a-90e4-e25a5871e02b","customizationUuid":"55b1be94-671a-403e-a26c-667e9c47d091","description":null,"name":"VfVmee..vmme_vlc..module-1","version":"2","modelCustomizationName":"VfVmee..vmme_vlc..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"vmme_vlc"},"inputs":{},"volumeGroupAllowed":false},"vf_vmee0..VfVmee..vmme_gpb..module-2":{"uuid":"41708296-e443-4c71-953f-d9a010f059e1","invariantUuid":"1cca90b8-3490-495e-87da-3f3e4c57d5b9","customizationUuid":"6add59e0-7fe1-4bc4-af48-f8812422ae7c","description":null,"name":"VfVmee..vmme_gpb..module-2","version":"2","modelCustomizationName":"VfVmee..vmme_gpb..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"vmme_gpb"},"inputs":{},"volumeGroupAllowed":false},"vf_vmee0..VfVmee..base_vmme..module-0":{"uuid":"a27f5cfc-7f12-4f99-af08-0af9c3885c87","invariantUuid":"a6f9e51a-2b35-416a-ae15-15e58d61f36d","customizationUuid":"f8c040f1-7e51-4a11-aca8-acf256cfd861","description":null,"name":"VfVmee..base_vmme..module-0","version":"2","modelCustomizationName":"VfVmee..base_vmme..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"base_vmme"},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"vf_vmee0..VfVmee..base_vmme..module-0":{"uuid":"a27f5cfc-7f12-4f99-af08-0af9c3885c87","invariantUuid":"a6f9e51a-2b35-416a-ae15-15e58d61f36d","customizationUuid":"f8c040f1-7e51-4a11-aca8-acf256cfd861","description":null,"name":"VfVmee..base_vmme..module-0","version":"2","modelCustomizationName":"VfVmee..base_vmme..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"base_vmme"},"inputs":{}}},"pnfs":{}}');
+ return JSON.parse('{"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":{"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","ecomp_generated_naming":"false","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,"vfModuleLabel":"vflorence_vlc"},"inputs":{},"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,"vfModuleLabel":"vflorence_gpb"},"inputs":{},"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,"vfModuleLabel":"base_vflorence"},"inputs":{},"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,"vfModuleLabel":"base_vflorence"},"inputs":{}}},"vfcInstanceGroups":{}}},"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"}},"collectionResources":{},"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,"vfModuleLabel":"vflorence_vlc"},"inputs":{},"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,"vfModuleLabel":"vflorence_gpb"},"inputs":{},"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,"vfModuleLabel":"base_vflorence"},"inputs":{},"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,"vfModuleLabel":"base_vflorence"},"inputs":{}}},"pnfs":{}}');
}
@@ -198,14 +199,14 @@ function generateVFModule() {
'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},
'commands': {},
'volumeGroupAllowed': true,
'inputs': {
- '2017488_adiodvpe0_vnf_config_template_version': {
+ '2017488_pasqualevpe0_vnf_config_template_version': {
'type': 'string',
'description': 'VPE Software Version',
'entry_schema': null,
@@ -213,7 +214,7 @@ function generateVFModule() {
'required': true,
'default': '17.2'
},
- '2017488_adiodvpe0_AIC_CLLI': {
+ '2017488_pasqualevpe0_AIC_CLLI': {
'type': 'string',
'description': 'AIC Site CLLI',
'entry_schema': null,
@@ -231,9 +232,9 @@ function generateVFModule2() {
'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},
'commands': {},
'volumeGroupAllowed': true,
@@ -245,8 +246,8 @@ function generateVNF() {
return {
'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': {
@@ -303,25 +304,25 @@ function generateVNF() {
'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'},
- 'AIC_CLLI': {'displayName': 'AIC_CLLI', 'command': 'get_input', 'inputName': '2017488_adiodvpe0_AIC_CLLI'},
- 'ASN': {'displayName': 'ASN', 'command': 'get_input', 'inputName': '2017488_adiodvpe0_ASN'},
+ '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_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',
@@ -365,7 +366,7 @@ function generateVNF() {
'nf_function': 'JAI',
'vmxvpfe_sriov43_0_port_unknownmulticastallow': 'true',
'vmxvre_int_ctl_ip_0': '10.0.0.10',
- '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',
@@ -373,14 +374,14 @@ function generateVNF() {
'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',
@@ -390,7 +391,7 @@ function generateVNF() {
'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',
@@ -404,7 +405,7 @@ function generateVNF() {
'vmxvpfe_flavor_name': 'ns.c20r16d25.v5'
},
'type': 'VF',
- 'modelCustomizationName': '2017-388_ADIOD-vPE 1',
+ 'modelCustomizationName': '2017-388_PASQUALE-vPE 1',
'vfModules': {},
'volumeGroups': {}
};
diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
index ec7bb0214..01ecb2cdf 100644
--- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
+++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
@@ -9,6 +9,7 @@ export enum Features {
FLAG_VF_MODULE_RESUME_STATUS_CREATE = 'FLAG_VF_MODULE_RESUME_STATUS_CREATE',
DRAG_AND_DROP_OPERATION = 'DRAG_AND_DROP_OPERATION',
FLAG_1906_COMPONENT_INFO = 'FLAG_1906_COMPONENT_INFO',
+ FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE'
}
@Injectable()