aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/shared/components/genericForm
diff options
context:
space:
mode:
Diffstat (limited to 'vid-webpack-master/src/app/shared/components/genericForm')
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/basic.control.generator.spec.ts6
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts1008
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.ts5
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts1140
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.ts31
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts1037
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts1014
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.ts2
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts23
9 files changed, 3929 insertions, 337 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/basic.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/basic.control.generator.spec.ts
index 4189fba05..fc2eed4ae 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/basic.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/basic.control.generator.spec.ts
@@ -33,13 +33,13 @@ describe('Basic Control Generator', () => {
})().then(done).catch(done.fail));
- test('getlegacyRegion with JANET25 - isVisible true', () => {
- const instance = {lcpCloudRegionId : 'JANET25'};
+ test('getlegacyRegion with AAIAIC25 - isVisible true', () => {
+ const instance = {lcpCloudRegionId : 'AAIAIC25'};
const legacyRegionControl: FormControlModel = service.getLegacyRegion(instance);
expect(legacyRegionControl.isVisible).toBeTruthy();
});
- test('getlegacyRegion without JANET25 - isVisible false', () => {
+ test('getlegacyRegion without AAIAIC25 - isVisible false', () => {
const instance = {lcpCloudRegionId : 'olson3'};
const legacyRegionControl: FormControlModel = service.getLegacyRegion(instance);
expect(legacyRegionControl.isVisible).toBeFalsy();
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
index 783f54bc3..5b64aea9b 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
@@ -23,15 +23,10 @@ class MockAppStore<T> {
"FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
"FLAG_SHOW_ASSIGNMENTS": true,
"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
- "FLAG_UNASSIGN_SERVICE": true,
"FLAG_SHOW_VERIFY_SERVICE": false,
- "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
- "FLAG_DUPLICATE_VNF": true,
"FLAG_SERVICE_MODEL_CACHE": true,
"CREATE_INSTANCE_TEST": false,
"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
- "FLAG_ASYNC_INSTANTIATION": true,
- "FLAG_ASYNC_JOBS": true,
"EMPTY_DRAWING_BOARD_TEST": false,
"FLAG_ADD_MSO_TESTAPI_FIELD": true
},
@@ -55,11 +50,11 @@ class MockAppStore<T> {
"inputs": {}
},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
- "description": "VSP_vMee",
- "name": "VF_vMee",
+ "description": "VSP_vGeraldine",
+ "name": "VF_vGeraldine",
"version": "2.0",
"customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
"inputs": {},
@@ -230,74 +225,74 @@ class MockAppStore<T> {
"sctp-b-egress-dst_end_port": "65535.0"
},
"type": "VF",
- "modelCustomizationName": "VF_vMee 0",
+ "modelCustomizationName": "VF_vGeraldine 0",
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -345,7 +340,7 @@ class MockAppStore<T> {
"modelCustomizationName": "ExtVL 0"
}
},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {
"Port Mirroring Configuration By Policy 0": {
"uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -366,72 +361,72 @@ class MockAppStore<T> {
},
"serviceProxies": {},
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -443,21 +438,21 @@ class MockAppStore<T> {
"6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
"networks" : {},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"rollbackOnFailure": "true",
"vfModules": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
- "vf_vmee0..VfVmee..base_vmme..module-0vmvzo": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo": {
"isMissingData": false,
"sdncPreReload": null,
"modelInfo": {
"modelType": "VFmodule",
"modelInvariantId": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
"modelVersionId": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- "modelName": "VfVmee..base_vmme..module-0",
+ "modelName": "VfVgeraldine..base_vflorence..module-0",
"modelVersion": "2",
"modelCustomizationId": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
- "modelCustomizationName": "VfVmee..base_vmme..module-0"
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0"
},
"instanceParams": [
{}
@@ -467,8 +462,8 @@ class MockAppStore<T> {
}
},
"isMissingData": true,
- "originalName": "VF_vMee 0",
- "vnfStoreKey": "VF_vMee 0",
+ "originalName": "VF_vGeraldine 0",
+ "vnfStoreKey": "VF_vGeraldine 0",
"trackById": "p3wk448m5do",
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -480,9 +475,9 @@ class MockAppStore<T> {
"modelType": "VF",
"modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
"modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
- "modelName": "VF_vMee",
+ "modelName": "VF_vGeraldine",
"modelVersion": "2.0",
- "modelCustomizationName": "VF_vMee 0"
+ "modelCustomizationName": "VF_vGeraldine 0"
}
}
},
@@ -526,8 +521,8 @@ class MockAppStore<T> {
"lcpRegionsAndTenants": {
"lcpRegionList": [
{
- "id": "JANET25",
- "name": "JANET25",
+ "id": "AAIAIC25",
+ "name": "AAIAIC25",
"isPermitted": true
},
{
@@ -537,7 +532,7 @@ class MockAppStore<T> {
}
],
"lcpRegionsTenantsMap": {
- "JANET25": [
+ "AAIAIC25": [
{
"id": "092eb9e8e4b7412e8787dd091bc58e86",
"name": "USP-SIP-IC-24335-T-01",
@@ -551,8 +546,128 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "d0a3e3f2964542259d155a81c41aadc3",
- "name": "test-hvf6-09",
+ "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "name": "AIN Web Tool-15-D-STTest2",
+ "isPermitted": true
+ },
+ {
+ "id": "1178612d2b394be4834ad77f567c0af2",
+ "name": "AIN Web Tool-15-D-SSPtestcustome",
+ "isPermitted": true
+ },
+ {
+ "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+ "name": "AIN Web Tool-15-D-UncheckedEcopm",
+ "isPermitted": true
+ },
+ {
+ "id": "de007636e25249238447264a988a927b",
+ "name": "AIN Web Tool-15-D-dfsdf",
+ "isPermitted": true
+ },
+ {
+ "id": "62f29b3613634ca6a3065cbe0e020c44",
+ "name": "AIN/SMS-16-D-Multiservices1",
+ "isPermitted": true
+ },
+ {
+ "id": "649289e30d3244e0b48098114d63c2aa",
+ "name": "AIN Web Tool-15-D-SSPST66",
+ "isPermitted": true
+ },
+ {
+ "id": "3f21eeea6c2c486bba31dab816c05a32",
+ "name": "AIN Web Tool-15-D-ASSPST47",
+ "isPermitted": true
+ },
+ {
+ "id": "f60ce21d3ee6427586cff0d22b03b773",
+ "name": "CESAR-100-D-sspjg67246",
+ "isPermitted": true
+ },
+ {
+ "id": "8774659e425f479895ae091bb5d46560",
+ "name": "CESAR-100-D-sspjg68359",
+ "isPermitted": true
+ },
+ {
+ "id": "624eb554b0d147c19ff8885341760481",
+ "name": "AINWebTool-15-D-iftach",
+ "isPermitted": true
+ },
+ {
+ "id": "214f55f5fc414c678059c383b03e4962",
+ "name": "CESAR-100-D-sspjg612401",
+ "isPermitted": true
+ },
+ {
+ "id": "c90666c291664841bb98e4d981ff1db5",
+ "name": "CESAR-100-D-sspjg621340",
+ "isPermitted": true
+ },
+ {
+ "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+ "name": "sspjg621351cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "b386b768a3f24c8e953abbe0b3488c02",
+ "name": "AINWebTool-15-D-eteancomp",
+ "isPermitted": true
+ },
+ {
+ "id": "dc6c4dbfd225474e9deaadd34968646c",
+ "name": "AINWebTool-15-T-SPFET",
+ "isPermitted": true
+ },
+ {
+ "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+ "name": "AINWebTool-15-X-eeweww",
+ "isPermitted": true
+ },
+ {
+ "id": "f2f3830e4c984d45bcd00e1a04158a79",
+ "name": "CESAR-100-D-spjg61909",
+ "isPermitted": true
+ },
+ {
+ "id": "05b91bd5137f4929878edd965755c06d",
+ "name": "CESAR-100-D-sspjg621512cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "7002fbe8482d4a989ddf445b1ce336e0",
+ "name": "AINWebTool-15-X-vdr",
+ "isPermitted": true
+ },
+ {
+ "id": "4008522be43741dcb1f5422022a2aa0b",
+ "name": "AINWebTool-15-D-ssasa",
+ "isPermitted": true
+ },
+ {
+ "id": "f44e2e96a1b6476abfda2fa407b00169",
+ "name": "AINWebTool-15-D-PFNPT",
+ "isPermitted": true
+ },
+ {
+ "id": "b69a52bec8a84669a37a1e8b72708be7",
+ "name": "AINWebTool-15-X-vdre",
+ "isPermitted": true
+ },
+ {
+ "id": "fac7d9fd56154caeb9332202dcf2969f",
+ "name": "AINWebTool-15-X-NONPODECOMP",
+ "isPermitted": true
+ },
+ {
+ "id": "2d34d8396e194eb49969fd61ffbff961",
+ "name": "DN5242-Nov16-T5",
+ "isPermitted": true
+ },
+ {
+ "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+ "name": "ro-T11",
"isPermitted": true
},
{
@@ -561,17 +676,27 @@ class MockAppStore<T> {
"isPermitted": true
},
{
+ "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+ "name": "DN5242-Nov21-T1",
+ "isPermitted": true
+ },
+ {
+ "id": "d0a3e3f2964542259d155a81c41aadc3",
+ "name": "test-hvf6-09",
+ "isPermitted": true
+ },
+ {
"id": "cbb99fe4ada84631b7baf046b6fd2044",
"name": "DN5242-Nov16-T3",
"isPermitted": true
}
- ]
+ ]
}
},
"productFamilies": [
{
"id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
- "name": "SCOTTIE",
+ "name": "ERICA",
"isPermitted": true
},
{
@@ -596,7 +721,7 @@ class MockAppStore<T> {
},
{
"id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": true
},
{
@@ -640,7 +765,7 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "Cisneros",
+ "id": "vMuriel",
"name": "vMuriel",
"isPermitted": true
},
@@ -666,7 +791,7 @@ class MockAppStore<T> {
},
{
"id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
- "name": "Josefina",
+ "name": "JOSEFINA",
"isPermitted": true
},
{
@@ -714,7 +839,7 @@ class MockAppStore<T> {
},
{
"id": "6",
- "name": "vSEGW",
+ "name": "vPorfirio",
"isPermitted": false
},
{
@@ -729,7 +854,7 @@ class MockAppStore<T> {
},
{
"id": "9",
- "name": "vMME",
+ "name": "vFLORENCE",
"isPermitted": false
},
{
@@ -739,7 +864,7 @@ class MockAppStore<T> {
},
{
"id": "11",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": false
},
{
@@ -749,7 +874,7 @@ class MockAppStore<T> {
},
{
"id": "13",
- "name": "vMMSC",
+ "name": "vWINIFRED",
"isPermitted": false
},
{
@@ -793,6 +918,754 @@ class MockAppStore<T> {
"name": "UUUAIAAI-YYY1"
},
{
+ "id": "BAN1",
+ "name": "VSDKYUTP-BAN1"
+ },
+ {
+ "id": "DKJ1",
+ "name": "DKJSJDKA-DKJ1"
+ },
+ {
+ "id": "MCS1",
+ "name": "ASACMAMS-MCS1"
+ },
+ {
+ "id": "UIO1",
+ "name": "uioclli1-UIO1"
+ },
+ {
+ "id": "RAJ1",
+ "name": "YGBIJNLQ-RAJ1"
+ },
+ {
+ "id": "OPA1",
+ "name": "opaclli1-OPA1"
+ },
+ {
+ "id": "SDE1",
+ "name": "ZXCVBNMA-SDE1"
+ },
+ {
+ "id": "VEN2",
+ "name": "FGHJUHIL-VEN2"
+ },
+ {
+ "id": "ORL1",
+ "name": "ORLDFLMA-ORL1"
+ },
+ {
+ "id": "JAD1",
+ "name": "JADECLLI-JAD1"
+ },
+ {
+ "id": "ZXL1",
+ "name": "LWLWCANN-ZXL1"
+ },
+ {
+ "id": "CKL1",
+ "name": "CLKSKCKK-CKL1"
+ },
+ {
+ "id": "SDF1",
+ "name": "sdfclli1-SDF1"
+ },
+ {
+ "id": "RAD1",
+ "name": "RADICAL1-RAD1"
+ },
+ {
+ "id": "KIT1",
+ "name": "BHYJFGLN-KIT1"
+ },
+ {
+ "id": "REL1",
+ "name": "INGERFGT-REL1"
+ },
+ {
+ "id": "JNL1",
+ "name": "CJALSDAC-JNL1"
+ },
+ {
+ "id": "OLK1",
+ "name": "OLKOLKLS-OLK1"
+ },
+ {
+ "id": "CHI1",
+ "name": "CHILLIWE-CHI1"
+ },
+ {
+ "id": "UUU4",
+ "name": "UUUAAAUU-UUU4"
+ },
+ {
+ "id": "TUF1",
+ "name": "TUFCLLI1-TUF1"
+ },
+ {
+ "id": "KJN1",
+ "name": "CKALDKSA-KJN1"
+ },
+ {
+ "id": "SAM1",
+ "name": "SNDGCA64-SAN1"
+ },
+ {
+ "id": "SCK1",
+ "name": "SCKSCKSK-SCK1"
+ },
+ {
+ "id": "HJH1",
+ "name": "AOEEQQQD-HJH1"
+ },
+ {
+ "id": "HGD1",
+ "name": "SDFQWHGD-HGD1"
+ },
+ {
+ "id": "KOR1",
+ "name": "HYFLNBVT-KOR1"
+ },
+ {
+ "id": "ATL43",
+ "name": "AICLOCID-ATL43"
+ },
+ {
+ "id": "ATL54",
+ "name": "AICFTAAI-ATL54"
+ },
+ {
+ "id": "ATL66",
+ "name": "CLLIAAII-ATL66"
+ },
+ {
+ "id": "VEL1",
+ "name": "BNMLKUIK-VEL1"
+ },
+ {
+ "id": "ICC1",
+ "name": "SANJITAT-ICC1"
+ },
+ {
+ "id": "MNT11",
+ "name": "WSXEFBTH-MNT11"
+ },
+ {
+ "id": "DEF2",
+ "name": "WSBHGTYL-DEF2"
+ },
+ {
+ "id": "MAD11",
+ "name": "SDFQWGKL-MAD11"
+ },
+ {
+ "id": "OLG1",
+ "name": "OLHOLHOL-OLG1"
+ },
+ {
+ "id": "GAR1",
+ "name": "NGFVSJKO-GAR1"
+ },
+ {
+ "id": "SAN22",
+ "name": "GNVLSCTL-SAN22"
+ },
+ {
+ "id": "HRG1",
+ "name": "HRGHRGGS-HRG1"
+ },
+ {
+ "id": "JCS1",
+ "name": "JCSJSCJS-JCS1"
+ },
+ {
+ "id": "DHA12",
+ "name": "WSXEDECF-DHA12"
+ },
+ {
+ "id": "HJE1",
+ "name": "AOEEWWWD-HJE1"
+ },
+ {
+ "id": "NCA1",
+ "name": "NCANCANN-NCA1"
+ },
+ {
+ "id": "IOP1",
+ "name": "iopclli1-IOP1"
+ },
+ {
+ "id": "RTY1",
+ "name": "rtyclli1-RTY1"
+ },
+ {
+ "id": "KAP1",
+ "name": "HIOUYTRQ-KAP1"
+ },
+ {
+ "id": "ZEN1",
+ "name": "ZENCLLI1-ZEN1"
+ },
+ {
+ "id": "HKA1",
+ "name": "JAKHLASS-HKA1"
+ },
+ {
+ "id": "CQK1",
+ "name": "CQKSCAKK-CQK1"
+ },
+ {
+ "id": "SAI1",
+ "name": "UBEKQLPD-SAI1"
+ },
+ {
+ "id": "ERT1",
+ "name": "ertclli1-ERT1"
+ },
+ {
+ "id": "IBB1",
+ "name": "PLMKOIJU-IBB1"
+ },
+ {
+ "id": "TIR2",
+ "name": "PLKINHYI-TIR2"
+ },
+ {
+ "id": "HSD1",
+ "name": "CHASKCDS-HSD1"
+ },
+ {
+ "id": "SLF78",
+ "name": "SDCTLFN1-SLF78"
+ },
+ {
+ "id": "SEE78",
+ "name": "SDCTEEE4-SEE78"
+ },
+ {
+ "id": "SAN13",
+ "name": "TOKYJPFA-SAN13"
+ },
+ {
+ "id": "SAA78",
+ "name": "SDCTAAA1-SAA78"
+ },
+ {
+ "id": "LUC1",
+ "name": "ATLDFGYC-LUC1"
+ },
+ {
+ "id": "AMD13",
+ "name": "MEMATLAN-AMD13"
+ },
+ {
+ "id": "TOR1",
+ "name": "TOROONXN-TOR1"
+ },
+ {
+ "id": "QWE1",
+ "name": "QWECLLI1-QWE1"
+ },
+ {
+ "id": "ZOG1",
+ "name": "ZOGASTRO-ZOG1"
+ },
+ {
+ "id": "CAL33",
+ "name": "CALIFORN-CAL33"
+ },
+ {
+ "id": "SHH78",
+ "name": "SDIT1HHH-SHH78"
+ },
+ {
+ "id": "DSA1",
+ "name": "LKJHGFDS-DSA1"
+ },
+ {
+ "id": "CLG1",
+ "name": "CLGRABAD-CLG1"
+ },
+ {
+ "id": "BNA1",
+ "name": "BNARAGBK-BNA1"
+ },
+ {
+ "id": "ATL84",
+ "name": "CANTTCOC-ATL84"
+ },
+ {
+ "id": "APP1",
+ "name": "WBHGTYUI-APP1"
+ },
+ {
+ "id": "RJN1",
+ "name": "RJNRBZAW-RJN1"
+ },
+ {
+ "id": "EHH78",
+ "name": "SDCSHHH5-EHH78"
+ },
+ {
+ "id": "mac10",
+ "name": "PKGTESTF-mac10"
+ },
+ {
+ "id": "SXB78",
+ "name": "SDCTGXB1-SXB78"
+ },
+ {
+ "id": "SAX78",
+ "name": "SDCTAXG1-SAX78"
+ },
+ {
+ "id": "SYD1",
+ "name": "SYDNAUBV-SYD1"
+ },
+ {
+ "id": "TOK1",
+ "name": "TOKYJPFA-TOK1"
+ },
+ {
+ "id": "KGM2",
+ "name": "KGMTNC20-KGM2"
+ },
+ {
+ "id": "DCC1b",
+ "name": "POIUYTGH-DCC1b"
+ },
+ {
+ "id": "SKK78",
+ "name": "SDCTKKK1-SKK78"
+ },
+ {
+ "id": "SGG78",
+ "name": "SDCTGGG1-SGG78"
+ },
+ {
+ "id": "SJJ78",
+ "name": "SDCTJJJ1-SJJ78"
+ },
+ {
+ "id": "SBX78",
+ "name": "SDCTBXG1-SBX78"
+ },
+ {
+ "id": "LAG1",
+ "name": "LARGIZON-LAG1"
+ },
+ {
+ "id": "IAA1",
+ "name": "QAZXSWED-IAA1"
+ },
+ {
+ "id": "POI1",
+ "name": "PLMNJKIU-POI1"
+ },
+ {
+ "id": "LAG1a",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "PBL1",
+ "name": "PBLAPBAI-PBL1"
+ },
+ {
+ "id": "LAG45",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "MAR1",
+ "name": "MNBVCXZM-MAR1"
+ },
+ {
+ "id": "HST70",
+ "name": "HSTNTX70-HST70"
+ },
+ {
+ "id": "DCC1a",
+ "name": "POIUYTGH-DCC1a"
+ },
+ {
+ "id": "TOL1",
+ "name": "TOLDOH21-TOL1"
+ },
+ {
+ "id": "LON1",
+ "name": "LONEENCO-LON1"
+ },
+ {
+ "id": "SJU78",
+ "name": "SDIT1JUB-SJU78"
+ },
+ {
+ "id": "STN27",
+ "name": "HSTNTX01-STN27"
+ },
+ {
+ "id": "SSW56",
+ "name": "ss8126GT-SSW56"
+ },
+ {
+ "id": "SBB78",
+ "name": "SDIT1BBB-SBB78"
+ },
+ {
+ "id": "DCC3",
+ "name": "POIUYTGH-DCC3"
+ },
+ {
+ "id": "GNV1",
+ "name": "GNVLSCTL-GNV1"
+ },
+ {
+ "id": "WAS1",
+ "name": "WASHDCSW-WAS1"
+ },
+ {
+ "id": "TOY1",
+ "name": "TORYONNZ-TOY1"
+ },
+ {
+ "id": "STT1",
+ "name": "STTLWA02-STT1"
+ },
+ {
+ "id": "STG1",
+ "name": "STTGGE62-STG1"
+ },
+ {
+ "id": "SLL78",
+ "name": "SDCTLLL1-SLL78"
+ },
+ {
+ "id": "SBU78",
+ "name": "SDIT1BUB-SBU78"
+ },
+ {
+ "id": "ATL2",
+ "name": "ATLNGANW-ATL2"
+ },
+ {
+ "id": "BOT1",
+ "name": "BOTHWAKY-BOT1"
+ },
+ {
+ "id": "SNG1",
+ "name": "SNGPSIAU-SNG1"
+ },
+ {
+ "id": "NYC1",
+ "name": "NYCMNY54-NYC1"
+ },
+ {
+ "id": "LAG1b",
+ "name": "LARGIZON-LAG1b"
+ },
+ {
+ "id": "AMD15",
+ "name": "AMDFAA01-AMD15"
+ },
+ {
+ "id": "SNA1",
+ "name": "SNANTXCA-SNA1"
+ },
+ {
+ "id": "PLT1",
+ "name": "PLTNCA60-PLT1"
+ },
+ {
+ "id": "TLP1",
+ "name": "TLPNXM18-TLP1"
+ },
+ {
+ "id": "SDD81",
+ "name": "SAIT1DD6-SDD81"
+ },
+ {
+ "id": "DCC1",
+ "name": "POIUYTGH-DCC1"
+ },
+ {
+ "id": "DCC2",
+ "name": "POIUYTGH-DCC2"
+ },
+ {
+ "id": "OKC1",
+ "name": "OKCBOK55-OKC1"
+ },
+ {
+ "id": "PAR1",
+ "name": "PARSFRCG-PAR1"
+ },
+ {
+ "id": "TES36",
+ "name": "ABCEETES-TES36"
+ },
+ {
+ "id": "COM1",
+ "name": "PLMKOPIU-COM1"
+ },
+ {
+ "id": "ANI1",
+ "name": "ATLNGTRE-ANI1"
+ },
+ {
+ "id": "SDG78",
+ "name": "SDIT1BDG-SDG78"
+ },
+ {
+ "id": "mac20",
+ "name": "PKGTESTF-mac20"
+ },
+ {
+ "id": "DSF45",
+ "name": "DSFBG123-DSF45"
+ },
+ {
+ "id": "HST25",
+ "name": "HSTNTX01-HST25"
+ },
+ {
+ "id": "AMD18",
+ "name": "AUDIMA01-AMD18"
+ },
+ {
+ "id": "SAA80",
+ "name": "SAIT9AA3-SAA80"
+ },
+ {
+ "id": "SSA56",
+ "name": "SSIT2AA7-SSA56"
+ },
+ {
+ "id": "SDD82",
+ "name": "SAIT1DD9-SDD82"
+ },
+ {
+ "id": "JCV1",
+ "name": "JCVLFLBW-JCV1"
+ },
+ {
+ "id": "SUL2",
+ "name": "WERTYUJK-SUL2"
+ },
+ {
+ "id": "PUR1",
+ "name": "purelyde-PUR1"
+ },
+ {
+ "id": "FDE55",
+ "name": "FDERT555-FDE55"
+ },
+ {
+ "id": "SITE",
+ "name": "LONEENCO-SITE"
+ },
+ {
+ "id": "ATL1",
+ "name": "ATLNGAMA-ATL1"
+ },
+ {
+ "id": "JUL1",
+ "name": "ZXCVBNMM-JUL1"
+ },
+ {
+ "id": "TAT34",
+ "name": "TESAAISB-TAT34"
+ },
+ {
+ "id": "XCP12",
+ "name": "CHKGH123-XCP12"
+ },
+ {
+ "id": "RAI1",
+ "name": "poiuytre-RAI1"
+ },
+ {
+ "id": "HPO1",
+ "name": "ATLNGAUP-HPO1"
+ },
+ {
+ "id": "KJF12",
+ "name": "KJFDH123-KJF12"
+ },
+ {
+ "id": "SCC80",
+ "name": "SAIT9CC3-SCC80"
+ },
+ {
+ "id": "SAA12",
+ "name": "SAIT9AF8-SAA12"
+ },
+ {
+ "id": "SAA14",
+ "name": "SAIT1AA9-SAA14"
+ },
+ {
+ "id": "ATL35",
+ "name": "TTESSAAI-ATL35"
+ },
+ {
+ "id": "CWY1",
+ "name": "CWYMOWBS-CWY1"
+ },
+ {
+ "id": "ATL76",
+ "name": "TELEPAAI-ATL76"
+ },
+ {
+ "id": "DSL12",
+ "name": "DSLFK242-DSL12"
+ },
+ {
+ "id": "ATL53",
+ "name": "AAIATLTE-ATL53"
+ },
+ {
+ "id": "SAA11",
+ "name": "SAIT9AA2-SAA11"
+ },
+ {
+ "id": "ATL62",
+ "name": "TESSASCH-ATL62"
+ },
+ {
+ "id": "AUG1",
+ "name": "ASDFGHJK-AUG1"
+ },
+ {
+ "id": "POI22",
+ "name": "POIUY123-POI22"
+ },
+ {
+ "id": "SAA13",
+ "name": "SAIT1AA9-SAA13"
+ },
+ {
+ "id": "BHY17",
+ "name": "BHYTFRF3-BHY17"
+ },
+ {
+ "id": "LIS1",
+ "name": "HOSTPROF-LIS1"
+ },
+ {
+ "id": "SIP1",
+ "name": "ZXCVBNMK-SIP1"
+ },
+ {
+ "id": "ATL99",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "ATL64",
+ "name": "FORLOAAJ-ATL64"
+ },
+ {
+ "id": "TAT33",
+ "name": "TESAAISA-TAT33"
+ },
+ {
+ "id": "RAD10",
+ "name": "INDIPUNE-RAD10"
+ },
+ {
+ "id": "RTW5",
+ "name": "BHYTFRY4-RTW5"
+ },
+ {
+ "id": "JGS1",
+ "name": "KSJKKKKK-JGS1"
+ },
+ {
+ "id": "ATL98",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "WAN1",
+ "name": "LEIWANGW-WAN1"
+ },
+ {
+ "id": "ATL44",
+ "name": "ATLSANAB-ATL44"
+ },
+ {
+ "id": "RTD2",
+ "name": "BHYTFRk4-RTD2"
+ },
+ {
+ "id": "NIR1",
+ "name": "ORFLMANA-NIR1"
+ },
+ {
+ "id": "ATL75",
+ "name": "SANAAIRE-ATL75"
+ },
+ {
+ "id": "NUM1",
+ "name": "QWERTYUI-NUM1"
+ },
+ {
+ "id": "hvf32",
+ "name": "MDTWNJ21-hvf32"
+ },
+ {
+ "id": "RTZ4",
+ "name": "BHYTFRZ6-RTZ4"
+ },
+ {
+ "id": "ATL56",
+ "name": "ATLSANAC-ATL56"
+ },
+ {
+ "id": "AMS1",
+ "name": "AMSTNLBW-AMS1"
+ },
+ {
+ "id": "RCT1",
+ "name": "AMSTERNL-RCT1"
+ },
+ {
+ "id": "JAN1",
+ "name": "ORFLMATT-JAN1"
+ },
+ {
+ "id": "ABC14",
+ "name": "TESAAISA-ABC14"
+ },
+ {
+ "id": "TAT37",
+ "name": "TESAAISD-TAT37"
+ },
+ {
+ "id": "MIC54",
+ "name": "MICHIGAN-MIC54"
+ },
+ {
+ "id": "ABC11",
+ "name": "ATLSANAI-ABC11"
+ },
+ {
+ "id": "AMF11",
+ "name": "AMDOCS01-AMF11"
+ },
+ {
+ "id": "ATL63",
+ "name": "ATLSANEW-ATL63"
+ },
+ {
+ "id": "ABC12",
+ "name": "ATLSECIA-ABC12"
+ },
+ {
+ "id": "hvf20",
+ "name": "MDTWNJ21-hvf20"
+ },
+ {
+ "id": "ABC15",
+ "name": "AAITESAN-ABC15"
+ },
+ {
"id": "AVT1",
"name": "AVTRFLHD-AVT1"
},
@@ -800,7 +1673,7 @@ class MockAppStore<T> {
"id": "ATL34",
"name": "ATLSANAI-ATL34"
}
- ],
+ ],
"categoryParameters": {
"owningEntityList": [
{
@@ -968,7 +1841,7 @@ describe('Network Control Generator', () => {
const mandatoryControls : string[] = [
FormControlNames.LCPCLOUD_REGION_ID,
'tenantId',
- 'platformName'
+ 'lineOfBusiness'
];
for(let i = 0 ; i < mandatoryControls.length ; i++){
let requiredExist = controls.find(ctrl => ctrl.controlName === mandatoryControls[i]).validations.find(item => item.validatorName === 'required');
@@ -1089,7 +1962,6 @@ describe('Network Control Generator', () => {
FormControlNames.INSTANCE_NAME,
FormControlNames.LCPCLOUD_REGION_ID,
'tenantId',
- 'platformName',
'rollbackOnFailure'
];
for(let i = 0 ; i < mandatoryControls.length ; i++){
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.ts
index c3a622338..11c4561c2 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.ts
@@ -17,7 +17,6 @@ import {AppState} from "../../../../store/reducers";
import {FormGroup} from "@angular/forms";
import {DropdownFormControl} from "../../../../models/formControlModels/dropdownFormControl.model";
import {FormControlType} from "../../../../models/formControlModels/formControlTypes.enum";
-import {InputFormControl} from "../../../../models/formControlModels/inputFormControl.model";
import {SelectOption} from "../../../../models/selectOption";
import {NetworkInstance} from "../../../../models/networkInstance";
import {NetworkModel} from "../../../../models/networkModel";
@@ -137,7 +136,7 @@ export class NetworkControlGenerator {
isDisabled: false,
name: "lineOfBusiness",
value: instance ? instance.lineOfBusiness : null,
- validations: [],
+ validations: [new ValidatorModel(ValidatorOptions.required, 'is required')],
onInitSelectedField: ['lineOfBusinessList'],
onInit: this._basicControlGenerator.getSubscribeInitResult.bind(null, this._aaiService.getCategoryParameters)
})
@@ -153,7 +152,7 @@ export class NetworkControlGenerator {
isDisabled: false,
name: "platform",
value: instance ? instance.platformName : null,
- validations: [new ValidatorModel(ValidatorOptions.required, 'is required')],
+ validations: [],
onInitSelectedField: ['platformList'],
onInit: this._basicControlGenerator.getSubscribeInitResult.bind(null, this._aaiService.getCategoryParameters)
})
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
index c89d3f06e..d90c65e38 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
@@ -11,9 +11,11 @@ import {LogService} from "../../../utils/log/log.service";
import {FormControlType} from "../../../models/formControlModels/formControlTypes.enum";
import {DropdownFormControl} from "../../../models/formControlModels/dropdownFormControl.model";
import {FeatureFlagsService} from "../../../services/featureFlag/feature-flags.service";
+import each from 'jest-each';
+import {VidNotions} from "../../../models/vidNotions";
class MockAppStore<T> {
- getState(){
+ getState() {
return {
"global": {
"name": null,
@@ -21,15 +23,10 @@ class MockAppStore<T> {
"FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
"FLAG_SHOW_ASSIGNMENTS": true,
"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
- "FLAG_UNASSIGN_SERVICE": true,
"FLAG_SHOW_VERIFY_SERVICE": false,
- "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
- "FLAG_DUPLICATE_VNF": true,
"FLAG_SERVICE_MODEL_CACHE": true,
"CREATE_INSTANCE_TEST": false,
"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
- "FLAG_ASYNC_INSTANTIATION": true,
- "FLAG_ASYNC_JOBS": true,
"EMPTY_DRAWING_BOARD_TEST": false,
"FLAG_ADD_MSO_TESTAPI_FIELD": true
},
@@ -53,11 +50,11 @@ class MockAppStore<T> {
"inputs": {}
},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
- "description": "VSP_vMee",
- "name": "VF_vMee",
+ "description": "VSP_vGeraldine",
+ "name": "VF_vGeraldine",
"version": "2.0",
"customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
"inputs": {},
@@ -228,74 +225,74 @@ class MockAppStore<T> {
"sctp-b-egress-dst_end_port": "65535.0"
},
"type": "VF",
- "modelCustomizationName": "VF_vMee 0",
+ "modelCustomizationName": "VF_vGeraldine 0",
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -323,7 +320,7 @@ class MockAppStore<T> {
"modelCustomizationName": "ExtVL 0"
}
},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {
"Port Mirroring Configuration By Policy 0": {
"uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -344,85 +341,150 @@ class MockAppStore<T> {
},
"serviceProxies": {},
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
},
"pnfs": {}
+ },
+ "7e59c5de-f052-46fa-aa7e-2fca9d674c43": {
+ "service": {
+ "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+ "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "name": "ComplexService",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Emanuel",
+ "serviceType": "Transport",
+ "serviceRole": "",
+ "description": "ComplexService",
+ "serviceEcompNaming": "false",
+ "instantiationType": "Macro",
+ "vidNotions": {
+ "instantiationUI": "TRANSPORT_SERVICE",
+ "modelCategory": "Transport",
+ "viewEditUI": "TRANSPORT_SERVICE",
+ "instantiationType": "Macro"
+ },
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {},
+ "collectionResources": {},
+ "configurations": {},
+ "serviceProxies": {},
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {
+ "PNF4": {
+ "uuid": "1c831fa9-28a6-4778-8c1d-80b9e769f2ed",
+ "invariantUuid": "74e13a12-dac9-4fba-b102-cd242d9e7f02",
+ "description": "AIM Transport service",
+ "name": "AIM PNF Model",
+ "version": "1.0",
+ "customizationUuid": "ce2453ef-4e8e-4108-944c-57bef89cfab0",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "nf_function": "AIM CE",
+ "nf_role": "pCE",
+ "ecomp_generated_naming": "false",
+ "nf_type": "ROUTER"
+ },
+ "type": "PNF"
+ },
+ "PNF1": {
+ "uuid": "1c831fa9-28a6-4778-8c1d-80b9e769f2ed",
+ "invariantUuid": "74e13a12-dac9-4fba-b102-cd242d9e7f02",
+ "description": "AIM Transport service",
+ "name": "AIM PNF Model",
+ "version": "1.0",
+ "customizationUuid": "dce78da7-c842-47a1-aba2-2de1cd03ab7a",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "nf_function": "SDNGW",
+ "nf_role": "pD2IPE",
+ "ecomp_generated_naming": "false",
+ "nf_type": "ROUTER"
+ },
+ "type": "PNF"
+ }
+ }
}
},
"serviceInstance": {},
"lcpRegionsAndTenants": {
"lcpRegionList": [
{
- "id": "JANET25",
- "name": "JANET25",
+ "id": "AAIAIC25",
+ "name": "AAIAIC25",
"isPermitted": true
},
{
@@ -432,7 +494,7 @@ class MockAppStore<T> {
}
],
"lcpRegionsTenantsMap": {
- "JANET25": [
+ "AAIAIC25": [
{
"id": "092eb9e8e4b7412e8787dd091bc58e86",
"name": "USP-SIP-IC-24335-T-01",
@@ -446,8 +508,128 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "d0a3e3f2964542259d155a81c41aadc3",
- "name": "test-hvf6-09",
+ "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "name": "AIN Web Tool-15-D-STTest2",
+ "isPermitted": true
+ },
+ {
+ "id": "1178612d2b394be4834ad77f567c0af2",
+ "name": "AIN Web Tool-15-D-SSPtestcustome",
+ "isPermitted": true
+ },
+ {
+ "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+ "name": "AIN Web Tool-15-D-UncheckedEcopm",
+ "isPermitted": true
+ },
+ {
+ "id": "de007636e25249238447264a988a927b",
+ "name": "AIN Web Tool-15-D-dfsdf",
+ "isPermitted": true
+ },
+ {
+ "id": "62f29b3613634ca6a3065cbe0e020c44",
+ "name": "AIN/SMS-16-D-Multiservices1",
+ "isPermitted": true
+ },
+ {
+ "id": "649289e30d3244e0b48098114d63c2aa",
+ "name": "AIN Web Tool-15-D-SSPST66",
+ "isPermitted": true
+ },
+ {
+ "id": "3f21eeea6c2c486bba31dab816c05a32",
+ "name": "AIN Web Tool-15-D-ASSPST47",
+ "isPermitted": true
+ },
+ {
+ "id": "f60ce21d3ee6427586cff0d22b03b773",
+ "name": "CESAR-100-D-sspjg67246",
+ "isPermitted": true
+ },
+ {
+ "id": "8774659e425f479895ae091bb5d46560",
+ "name": "CESAR-100-D-sspjg68359",
+ "isPermitted": true
+ },
+ {
+ "id": "624eb554b0d147c19ff8885341760481",
+ "name": "AINWebTool-15-D-iftach",
+ "isPermitted": true
+ },
+ {
+ "id": "214f55f5fc414c678059c383b03e4962",
+ "name": "CESAR-100-D-sspjg612401",
+ "isPermitted": true
+ },
+ {
+ "id": "c90666c291664841bb98e4d981ff1db5",
+ "name": "CESAR-100-D-sspjg621340",
+ "isPermitted": true
+ },
+ {
+ "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+ "name": "sspjg621351cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "b386b768a3f24c8e953abbe0b3488c02",
+ "name": "AINWebTool-15-D-eteancomp",
+ "isPermitted": true
+ },
+ {
+ "id": "dc6c4dbfd225474e9deaadd34968646c",
+ "name": "AINWebTool-15-T-SPFET",
+ "isPermitted": true
+ },
+ {
+ "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+ "name": "AINWebTool-15-X-eeweww",
+ "isPermitted": true
+ },
+ {
+ "id": "f2f3830e4c984d45bcd00e1a04158a79",
+ "name": "CESAR-100-D-spjg61909",
+ "isPermitted": true
+ },
+ {
+ "id": "05b91bd5137f4929878edd965755c06d",
+ "name": "CESAR-100-D-sspjg621512cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "7002fbe8482d4a989ddf445b1ce336e0",
+ "name": "AINWebTool-15-X-vdr",
+ "isPermitted": true
+ },
+ {
+ "id": "4008522be43741dcb1f5422022a2aa0b",
+ "name": "AINWebTool-15-D-ssasa",
+ "isPermitted": true
+ },
+ {
+ "id": "f44e2e96a1b6476abfda2fa407b00169",
+ "name": "AINWebTool-15-D-PFNPT",
+ "isPermitted": true
+ },
+ {
+ "id": "b69a52bec8a84669a37a1e8b72708be7",
+ "name": "AINWebTool-15-X-vdre",
+ "isPermitted": true
+ },
+ {
+ "id": "fac7d9fd56154caeb9332202dcf2969f",
+ "name": "AINWebTool-15-X-NONPODECOMP",
+ "isPermitted": true
+ },
+ {
+ "id": "2d34d8396e194eb49969fd61ffbff961",
+ "name": "DN5242-Nov16-T5",
+ "isPermitted": true
+ },
+ {
+ "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+ "name": "ro-T11",
"isPermitted": true
},
{
@@ -456,6 +638,16 @@ class MockAppStore<T> {
"isPermitted": true
},
{
+ "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+ "name": "DN5242-Nov21-T1",
+ "isPermitted": true
+ },
+ {
+ "id": "d0a3e3f2964542259d155a81c41aadc3",
+ "name": "test-hvf6-09",
+ "isPermitted": true
+ },
+ {
"id": "cbb99fe4ada84631b7baf046b6fd2044",
"name": "DN5242-Nov16-T3",
"isPermitted": true
@@ -466,7 +658,7 @@ class MockAppStore<T> {
"productFamilies": [
{
"id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
- "name": "SCOTTIE",
+ "name": "ERICA",
"isPermitted": true
},
{
@@ -491,7 +683,7 @@ class MockAppStore<T> {
},
{
"id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": true
},
{
@@ -535,7 +727,7 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "Cisneros",
+ "id": "vMuriel",
"name": "vMuriel",
"isPermitted": true
},
@@ -561,7 +753,7 @@ class MockAppStore<T> {
},
{
"id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
- "name": "Josefina",
+ "name": "JOSEFINA",
"isPermitted": true
},
{
@@ -609,7 +801,7 @@ class MockAppStore<T> {
},
{
"id": "6",
- "name": "vSEGW",
+ "name": "vPorfirio",
"isPermitted": false
},
{
@@ -624,7 +816,7 @@ class MockAppStore<T> {
},
{
"id": "9",
- "name": "vMME",
+ "name": "vFLORENCE",
"isPermitted": false
},
{
@@ -634,7 +826,7 @@ class MockAppStore<T> {
},
{
"id": "11",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": false
},
{
@@ -644,7 +836,7 @@ class MockAppStore<T> {
},
{
"id": "13",
- "name": "vMMSC",
+ "name": "vWINIFRED",
"isPermitted": false
},
{
@@ -688,6 +880,754 @@ class MockAppStore<T> {
"name": "UUUAIAAI-YYY1"
},
{
+ "id": "BAN1",
+ "name": "VSDKYUTP-BAN1"
+ },
+ {
+ "id": "DKJ1",
+ "name": "DKJSJDKA-DKJ1"
+ },
+ {
+ "id": "MCS1",
+ "name": "ASACMAMS-MCS1"
+ },
+ {
+ "id": "UIO1",
+ "name": "uioclli1-UIO1"
+ },
+ {
+ "id": "RAJ1",
+ "name": "YGBIJNLQ-RAJ1"
+ },
+ {
+ "id": "OPA1",
+ "name": "opaclli1-OPA1"
+ },
+ {
+ "id": "SDE1",
+ "name": "ZXCVBNMA-SDE1"
+ },
+ {
+ "id": "VEN2",
+ "name": "FGHJUHIL-VEN2"
+ },
+ {
+ "id": "ORL1",
+ "name": "ORLDFLMA-ORL1"
+ },
+ {
+ "id": "JAD1",
+ "name": "JADECLLI-JAD1"
+ },
+ {
+ "id": "ZXL1",
+ "name": "LWLWCANN-ZXL1"
+ },
+ {
+ "id": "CKL1",
+ "name": "CLKSKCKK-CKL1"
+ },
+ {
+ "id": "SDF1",
+ "name": "sdfclli1-SDF1"
+ },
+ {
+ "id": "RAD1",
+ "name": "RADICAL1-RAD1"
+ },
+ {
+ "id": "KIT1",
+ "name": "BHYJFGLN-KIT1"
+ },
+ {
+ "id": "REL1",
+ "name": "INGERFGT-REL1"
+ },
+ {
+ "id": "JNL1",
+ "name": "CJALSDAC-JNL1"
+ },
+ {
+ "id": "OLK1",
+ "name": "OLKOLKLS-OLK1"
+ },
+ {
+ "id": "CHI1",
+ "name": "CHILLIWE-CHI1"
+ },
+ {
+ "id": "UUU4",
+ "name": "UUUAAAUU-UUU4"
+ },
+ {
+ "id": "TUF1",
+ "name": "TUFCLLI1-TUF1"
+ },
+ {
+ "id": "KJN1",
+ "name": "CKALDKSA-KJN1"
+ },
+ {
+ "id": "SAM1",
+ "name": "SNDGCA64-SAN1"
+ },
+ {
+ "id": "SCK1",
+ "name": "SCKSCKSK-SCK1"
+ },
+ {
+ "id": "HJH1",
+ "name": "AOEEQQQD-HJH1"
+ },
+ {
+ "id": "HGD1",
+ "name": "SDFQWHGD-HGD1"
+ },
+ {
+ "id": "KOR1",
+ "name": "HYFLNBVT-KOR1"
+ },
+ {
+ "id": "ATL43",
+ "name": "AICLOCID-ATL43"
+ },
+ {
+ "id": "ATL54",
+ "name": "AICFTAAI-ATL54"
+ },
+ {
+ "id": "ATL66",
+ "name": "CLLIAAII-ATL66"
+ },
+ {
+ "id": "VEL1",
+ "name": "BNMLKUIK-VEL1"
+ },
+ {
+ "id": "ICC1",
+ "name": "SANJITAT-ICC1"
+ },
+ {
+ "id": "MNT11",
+ "name": "WSXEFBTH-MNT11"
+ },
+ {
+ "id": "DEF2",
+ "name": "WSBHGTYL-DEF2"
+ },
+ {
+ "id": "MAD11",
+ "name": "SDFQWGKL-MAD11"
+ },
+ {
+ "id": "OLG1",
+ "name": "OLHOLHOL-OLG1"
+ },
+ {
+ "id": "GAR1",
+ "name": "NGFVSJKO-GAR1"
+ },
+ {
+ "id": "SAN22",
+ "name": "GNVLSCTL-SAN22"
+ },
+ {
+ "id": "HRG1",
+ "name": "HRGHRGGS-HRG1"
+ },
+ {
+ "id": "JCS1",
+ "name": "JCSJSCJS-JCS1"
+ },
+ {
+ "id": "DHA12",
+ "name": "WSXEDECF-DHA12"
+ },
+ {
+ "id": "HJE1",
+ "name": "AOEEWWWD-HJE1"
+ },
+ {
+ "id": "NCA1",
+ "name": "NCANCANN-NCA1"
+ },
+ {
+ "id": "IOP1",
+ "name": "iopclli1-IOP1"
+ },
+ {
+ "id": "RTY1",
+ "name": "rtyclli1-RTY1"
+ },
+ {
+ "id": "KAP1",
+ "name": "HIOUYTRQ-KAP1"
+ },
+ {
+ "id": "ZEN1",
+ "name": "ZENCLLI1-ZEN1"
+ },
+ {
+ "id": "HKA1",
+ "name": "JAKHLASS-HKA1"
+ },
+ {
+ "id": "CQK1",
+ "name": "CQKSCAKK-CQK1"
+ },
+ {
+ "id": "SAI1",
+ "name": "UBEKQLPD-SAI1"
+ },
+ {
+ "id": "ERT1",
+ "name": "ertclli1-ERT1"
+ },
+ {
+ "id": "IBB1",
+ "name": "PLMKOIJU-IBB1"
+ },
+ {
+ "id": "TIR2",
+ "name": "PLKINHYI-TIR2"
+ },
+ {
+ "id": "HSD1",
+ "name": "CHASKCDS-HSD1"
+ },
+ {
+ "id": "SLF78",
+ "name": "SDCTLFN1-SLF78"
+ },
+ {
+ "id": "SEE78",
+ "name": "SDCTEEE4-SEE78"
+ },
+ {
+ "id": "SAN13",
+ "name": "TOKYJPFA-SAN13"
+ },
+ {
+ "id": "SAA78",
+ "name": "SDCTAAA1-SAA78"
+ },
+ {
+ "id": "LUC1",
+ "name": "ATLDFGYC-LUC1"
+ },
+ {
+ "id": "AMD13",
+ "name": "MEMATLAN-AMD13"
+ },
+ {
+ "id": "TOR1",
+ "name": "TOROONXN-TOR1"
+ },
+ {
+ "id": "QWE1",
+ "name": "QWECLLI1-QWE1"
+ },
+ {
+ "id": "ZOG1",
+ "name": "ZOGASTRO-ZOG1"
+ },
+ {
+ "id": "CAL33",
+ "name": "CALIFORN-CAL33"
+ },
+ {
+ "id": "SHH78",
+ "name": "SDIT1HHH-SHH78"
+ },
+ {
+ "id": "DSA1",
+ "name": "LKJHGFDS-DSA1"
+ },
+ {
+ "id": "CLG1",
+ "name": "CLGRABAD-CLG1"
+ },
+ {
+ "id": "BNA1",
+ "name": "BNARAGBK-BNA1"
+ },
+ {
+ "id": "ATL84",
+ "name": "CANTTCOC-ATL84"
+ },
+ {
+ "id": "APP1",
+ "name": "WBHGTYUI-APP1"
+ },
+ {
+ "id": "RJN1",
+ "name": "RJNRBZAW-RJN1"
+ },
+ {
+ "id": "EHH78",
+ "name": "SDCSHHH5-EHH78"
+ },
+ {
+ "id": "mac10",
+ "name": "PKGTESTF-mac10"
+ },
+ {
+ "id": "SXB78",
+ "name": "SDCTGXB1-SXB78"
+ },
+ {
+ "id": "SAX78",
+ "name": "SDCTAXG1-SAX78"
+ },
+ {
+ "id": "SYD1",
+ "name": "SYDNAUBV-SYD1"
+ },
+ {
+ "id": "TOK1",
+ "name": "TOKYJPFA-TOK1"
+ },
+ {
+ "id": "KGM2",
+ "name": "KGMTNC20-KGM2"
+ },
+ {
+ "id": "DCC1b",
+ "name": "POIUYTGH-DCC1b"
+ },
+ {
+ "id": "SKK78",
+ "name": "SDCTKKK1-SKK78"
+ },
+ {
+ "id": "SGG78",
+ "name": "SDCTGGG1-SGG78"
+ },
+ {
+ "id": "SJJ78",
+ "name": "SDCTJJJ1-SJJ78"
+ },
+ {
+ "id": "SBX78",
+ "name": "SDCTBXG1-SBX78"
+ },
+ {
+ "id": "LAG1",
+ "name": "LARGIZON-LAG1"
+ },
+ {
+ "id": "IAA1",
+ "name": "QAZXSWED-IAA1"
+ },
+ {
+ "id": "POI1",
+ "name": "PLMNJKIU-POI1"
+ },
+ {
+ "id": "LAG1a",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "PBL1",
+ "name": "PBLAPBAI-PBL1"
+ },
+ {
+ "id": "LAG45",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "MAR1",
+ "name": "MNBVCXZM-MAR1"
+ },
+ {
+ "id": "HST70",
+ "name": "HSTNTX70-HST70"
+ },
+ {
+ "id": "DCC1a",
+ "name": "POIUYTGH-DCC1a"
+ },
+ {
+ "id": "TOL1",
+ "name": "TOLDOH21-TOL1"
+ },
+ {
+ "id": "LON1",
+ "name": "LONEENCO-LON1"
+ },
+ {
+ "id": "SJU78",
+ "name": "SDIT1JUB-SJU78"
+ },
+ {
+ "id": "STN27",
+ "name": "HSTNTX01-STN27"
+ },
+ {
+ "id": "SSW56",
+ "name": "ss8126GT-SSW56"
+ },
+ {
+ "id": "SBB78",
+ "name": "SDIT1BBB-SBB78"
+ },
+ {
+ "id": "DCC3",
+ "name": "POIUYTGH-DCC3"
+ },
+ {
+ "id": "GNV1",
+ "name": "GNVLSCTL-GNV1"
+ },
+ {
+ "id": "WAS1",
+ "name": "WASHDCSW-WAS1"
+ },
+ {
+ "id": "TOY1",
+ "name": "TORYONNZ-TOY1"
+ },
+ {
+ "id": "STT1",
+ "name": "STTLWA02-STT1"
+ },
+ {
+ "id": "STG1",
+ "name": "STTGGE62-STG1"
+ },
+ {
+ "id": "SLL78",
+ "name": "SDCTLLL1-SLL78"
+ },
+ {
+ "id": "SBU78",
+ "name": "SDIT1BUB-SBU78"
+ },
+ {
+ "id": "ATL2",
+ "name": "ATLNGANW-ATL2"
+ },
+ {
+ "id": "BOT1",
+ "name": "BOTHWAKY-BOT1"
+ },
+ {
+ "id": "SNG1",
+ "name": "SNGPSIAU-SNG1"
+ },
+ {
+ "id": "NYC1",
+ "name": "NYCMNY54-NYC1"
+ },
+ {
+ "id": "LAG1b",
+ "name": "LARGIZON-LAG1b"
+ },
+ {
+ "id": "AMD15",
+ "name": "AMDFAA01-AMD15"
+ },
+ {
+ "id": "SNA1",
+ "name": "SNANTXCA-SNA1"
+ },
+ {
+ "id": "PLT1",
+ "name": "PLTNCA60-PLT1"
+ },
+ {
+ "id": "TLP1",
+ "name": "TLPNXM18-TLP1"
+ },
+ {
+ "id": "SDD81",
+ "name": "SAIT1DD6-SDD81"
+ },
+ {
+ "id": "DCC1",
+ "name": "POIUYTGH-DCC1"
+ },
+ {
+ "id": "DCC2",
+ "name": "POIUYTGH-DCC2"
+ },
+ {
+ "id": "OKC1",
+ "name": "OKCBOK55-OKC1"
+ },
+ {
+ "id": "PAR1",
+ "name": "PARSFRCG-PAR1"
+ },
+ {
+ "id": "TES36",
+ "name": "ABCEETES-TES36"
+ },
+ {
+ "id": "COM1",
+ "name": "PLMKOPIU-COM1"
+ },
+ {
+ "id": "ANI1",
+ "name": "ATLNGTRE-ANI1"
+ },
+ {
+ "id": "SDG78",
+ "name": "SDIT1BDG-SDG78"
+ },
+ {
+ "id": "mac20",
+ "name": "PKGTESTF-mac20"
+ },
+ {
+ "id": "DSF45",
+ "name": "DSFBG123-DSF45"
+ },
+ {
+ "id": "HST25",
+ "name": "HSTNTX01-HST25"
+ },
+ {
+ "id": "AMD18",
+ "name": "AUDIMA01-AMD18"
+ },
+ {
+ "id": "SAA80",
+ "name": "SAIT9AA3-SAA80"
+ },
+ {
+ "id": "SSA56",
+ "name": "SSIT2AA7-SSA56"
+ },
+ {
+ "id": "SDD82",
+ "name": "SAIT1DD9-SDD82"
+ },
+ {
+ "id": "JCV1",
+ "name": "JCVLFLBW-JCV1"
+ },
+ {
+ "id": "SUL2",
+ "name": "WERTYUJK-SUL2"
+ },
+ {
+ "id": "PUR1",
+ "name": "purelyde-PUR1"
+ },
+ {
+ "id": "FDE55",
+ "name": "FDERT555-FDE55"
+ },
+ {
+ "id": "SITE",
+ "name": "LONEENCO-SITE"
+ },
+ {
+ "id": "ATL1",
+ "name": "ATLNGAMA-ATL1"
+ },
+ {
+ "id": "JUL1",
+ "name": "ZXCVBNMM-JUL1"
+ },
+ {
+ "id": "TAT34",
+ "name": "TESAAISB-TAT34"
+ },
+ {
+ "id": "XCP12",
+ "name": "CHKGH123-XCP12"
+ },
+ {
+ "id": "RAI1",
+ "name": "poiuytre-RAI1"
+ },
+ {
+ "id": "HPO1",
+ "name": "ATLNGAUP-HPO1"
+ },
+ {
+ "id": "KJF12",
+ "name": "KJFDH123-KJF12"
+ },
+ {
+ "id": "SCC80",
+ "name": "SAIT9CC3-SCC80"
+ },
+ {
+ "id": "SAA12",
+ "name": "SAIT9AF8-SAA12"
+ },
+ {
+ "id": "SAA14",
+ "name": "SAIT1AA9-SAA14"
+ },
+ {
+ "id": "ATL35",
+ "name": "TTESSAAI-ATL35"
+ },
+ {
+ "id": "CWY1",
+ "name": "CWYMOWBS-CWY1"
+ },
+ {
+ "id": "ATL76",
+ "name": "TELEPAAI-ATL76"
+ },
+ {
+ "id": "DSL12",
+ "name": "DSLFK242-DSL12"
+ },
+ {
+ "id": "ATL53",
+ "name": "AAIATLTE-ATL53"
+ },
+ {
+ "id": "SAA11",
+ "name": "SAIT9AA2-SAA11"
+ },
+ {
+ "id": "ATL62",
+ "name": "TESSASCH-ATL62"
+ },
+ {
+ "id": "AUG1",
+ "name": "ASDFGHJK-AUG1"
+ },
+ {
+ "id": "POI22",
+ "name": "POIUY123-POI22"
+ },
+ {
+ "id": "SAA13",
+ "name": "SAIT1AA9-SAA13"
+ },
+ {
+ "id": "BHY17",
+ "name": "BHYTFRF3-BHY17"
+ },
+ {
+ "id": "LIS1",
+ "name": "HOSTPROF-LIS1"
+ },
+ {
+ "id": "SIP1",
+ "name": "ZXCVBNMK-SIP1"
+ },
+ {
+ "id": "ATL99",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "ATL64",
+ "name": "FORLOAAJ-ATL64"
+ },
+ {
+ "id": "TAT33",
+ "name": "TESAAISA-TAT33"
+ },
+ {
+ "id": "RAD10",
+ "name": "INDIPUNE-RAD10"
+ },
+ {
+ "id": "RTW5",
+ "name": "BHYTFRY4-RTW5"
+ },
+ {
+ "id": "JGS1",
+ "name": "KSJKKKKK-JGS1"
+ },
+ {
+ "id": "ATL98",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "WAN1",
+ "name": "LEIWANGW-WAN1"
+ },
+ {
+ "id": "ATL44",
+ "name": "ATLSANAB-ATL44"
+ },
+ {
+ "id": "RTD2",
+ "name": "BHYTFRk4-RTD2"
+ },
+ {
+ "id": "NIR1",
+ "name": "ORFLMANA-NIR1"
+ },
+ {
+ "id": "ATL75",
+ "name": "SANAAIRE-ATL75"
+ },
+ {
+ "id": "NUM1",
+ "name": "QWERTYUI-NUM1"
+ },
+ {
+ "id": "hvf32",
+ "name": "MDTWNJ21-hvf32"
+ },
+ {
+ "id": "RTZ4",
+ "name": "BHYTFRZ6-RTZ4"
+ },
+ {
+ "id": "ATL56",
+ "name": "ATLSANAC-ATL56"
+ },
+ {
+ "id": "AMS1",
+ "name": "AMSTNLBW-AMS1"
+ },
+ {
+ "id": "RCT1",
+ "name": "AMSTERNL-RCT1"
+ },
+ {
+ "id": "JAN1",
+ "name": "ORFLMATT-JAN1"
+ },
+ {
+ "id": "ABC14",
+ "name": "TESAAISA-ABC14"
+ },
+ {
+ "id": "TAT37",
+ "name": "TESAAISD-TAT37"
+ },
+ {
+ "id": "MIC54",
+ "name": "MICHIGAN-MIC54"
+ },
+ {
+ "id": "ABC11",
+ "name": "ATLSANAI-ABC11"
+ },
+ {
+ "id": "AMF11",
+ "name": "AMDOCS01-AMF11"
+ },
+ {
+ "id": "ATL63",
+ "name": "ATLSANEW-ATL63"
+ },
+ {
+ "id": "ABC12",
+ "name": "ATLSECIA-ABC12"
+ },
+ {
+ "id": "hvf20",
+ "name": "MDTWNJ21-hvf20"
+ },
+ {
+ "id": "ABC15",
+ "name": "AAITESAN-ABC15"
+ },
+ {
"id": "AVT1",
"name": "AVTRFLHD-AVT1"
},
@@ -829,7 +1769,8 @@ class MockAppStore<T> {
}
}
-class MockFeatureFlagsService {}
+class MockFeatureFlagsService {
+}
describe('Service Control Generator', () => {
let injector;
@@ -846,7 +1787,7 @@ describe('Service Control Generator', () => {
AaiService,
FormBuilder,
LogService,
- {provide:FeatureFlagsService, useClass: MockFeatureFlagsService},
+ {provide: FeatureFlagsService, useClass: MockFeatureFlagsService},
{provide: NgRedux, useClass: MockAppStore}]
});
await TestBed.compileComponents();
@@ -859,9 +1800,9 @@ describe('Service Control Generator', () => {
test('ServiceControlGenerator should return the correct controls with correct order', () => {
- const serviceId : string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const controls :FormControlModel[] = service.getMacroFormControls(serviceId);
- const globalSubscriberIdControl : DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.GLOBAL_SUBSCRIBER_ID);
+ const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+ const controls: FormControlModel[] = service.getMacroFormControls(serviceId);
+ const globalSubscriberIdControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.GLOBAL_SUBSCRIBER_ID);
expect(globalSubscriberIdControl.validations.find(val => val.validatorName === ValidatorOptions.required)).toBeDefined();
expect(globalSubscriberIdControl.dataTestId).toEqual('subscriberName');
@@ -872,7 +1813,7 @@ describe('Service Control Generator', () => {
expect(globalSubscriberIdControl.onInit).toBeDefined();
expect(globalSubscriberIdControl.onChange).toBeDefined();
- const serviceTypeControl : DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.SUBSCRIPTION_SERVICE_TYPE);
+ const serviceTypeControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.SUBSCRIPTION_SERVICE_TYPE);
expect(serviceTypeControl.validations.find(val => val.validatorName === ValidatorOptions.required)).toBeDefined();
expect(serviceTypeControl.dataTestId).toEqual('serviceType');
expect(serviceTypeControl.type).toEqual(FormControlType.DROPDOWN);
@@ -882,7 +1823,7 @@ describe('Service Control Generator', () => {
expect(serviceTypeControl.onInit).toBeDefined();
expect(serviceTypeControl.onChange).toBeDefined();
- const productFamilyControl : DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.PRODUCT_FAMILY_ID);
+ const productFamilyControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.PRODUCT_FAMILY_ID);
expect(productFamilyControl.validations.find(val => val.validatorName === ValidatorOptions.required)).toBeDefined();
expect(productFamilyControl.dataTestId).toEqual('productFamily');
expect(productFamilyControl.type).toEqual(FormControlType.DROPDOWN);
@@ -891,7 +1832,7 @@ describe('Service Control Generator', () => {
expect(productFamilyControl.displayName).toEqual('Product family');
expect(productFamilyControl.onInit).toBeDefined();
- const lcpRegionControl : DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.LCPCLOUD_REGION_ID);
+ const lcpRegionControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.LCPCLOUD_REGION_ID);
expect(lcpRegionControl.validations.find(val => val.validatorName === ValidatorOptions.required)).toBeDefined();
expect(lcpRegionControl.dataTestId).toEqual('lcpRegion');
expect(lcpRegionControl.type).toEqual(FormControlType.DROPDOWN);
@@ -901,7 +1842,7 @@ describe('Service Control Generator', () => {
expect(lcpRegionControl.onInit).toBeDefined();
expect(lcpRegionControl.onChange).toBeDefined();
- const tenantControl : DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.TENANT_ID);
+ const tenantControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.TENANT_ID);
expect(tenantControl.validations.find(val => val.validatorName === ValidatorOptions.required)).toBeDefined();
expect(tenantControl.dataTestId).toEqual('tenant');
expect(tenantControl.type).toEqual(FormControlType.DROPDOWN);
@@ -930,25 +1871,24 @@ describe('Service Control Generator', () => {
// 9. Pause on pause points
// 10. Project
// 11. Rollback on failure
- const serviceId : string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const controls :FormControlModel[] = service.getMacroFormControls(serviceId);
-
+ const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+ const controls: FormControlModel[] = service.getMacroFormControls(serviceId);
const controlsOrderNames = [
FormControlNames.INSTANCE_NAME,
FormControlNames.GLOBAL_SUBSCRIBER_ID,
- FormControlNames.SUBSCRIPTION_SERVICE_TYPE ,
- FormControlNames.OWNING_ENTITY_ID ,
- FormControlNames.PRODUCT_FAMILY_ID ,
- FormControlNames.LCPCLOUD_REGION_ID ,
- FormControlNames.TENANT_ID ,
- FormControlNames.AICZONE_ID ,
+ FormControlNames.SUBSCRIPTION_SERVICE_TYPE,
+ FormControlNames.OWNING_ENTITY_ID,
+ FormControlNames.PRODUCT_FAMILY_ID,
+ FormControlNames.LCPCLOUD_REGION_ID,
+ FormControlNames.TENANT_ID,
+ FormControlNames.AICZONE_ID,
FormControlNames.PAUSE,
- FormControlNames.PROJECT_NAME ,
+ FormControlNames.PROJECT_NAME,
FormControlNames.ROLLBACK_ON_FAILURE];
expect(controls.length).toEqual(11);
- for(let i = 0 ; i < controls.length ; i++){
+ for (let i = 0; i < controls.length; i++) {
expect(controls[i].controlName).toEqual(controlsOrderNames[i]);
}
});
@@ -961,21 +1901,57 @@ describe('Service Control Generator', () => {
// 4. Owning entity (fix Entity to entity)
// 5. Project
// 6. Rollback on failure
- const serviceId : string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const controls :FormControlModel[] = service.getAlaCartControls(serviceId);
+ const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+ const controls: FormControlModel[] = service.getAlaCartControls(serviceId);
const controlsOrderNames = [
FormControlNames.INSTANCE_NAME,
FormControlNames.GLOBAL_SUBSCRIBER_ID,
- FormControlNames.SUBSCRIPTION_SERVICE_TYPE ,
- FormControlNames.OWNING_ENTITY_ID ,
- FormControlNames.PROJECT_NAME ,
+ FormControlNames.SUBSCRIPTION_SERVICE_TYPE,
+ FormControlNames.OWNING_ENTITY_ID,
+ FormControlNames.PROJECT_NAME,
FormControlNames.ROLLBACK_ON_FAILURE];
expect(controls.length).toEqual(6);
- for(let i = 0 ; i < controls.length ; i++){
+ for (let i = 0; i < controls.length; i++) {
expect(controls[i].controlName).toEqual(controlsOrderNames[i]);
}
});
+ test('getMacroFormControls for Transport service type should return optional for lcp region and tenant', () => {
+ const serviceId: string = "7e59c5de-f052-46fa-aa7e-2fca9d674c43";
+ const controls: FormControlModel[] = service.getMacroFormControls(serviceId);
+
+ const lcpRegionControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.LCPCLOUD_REGION_ID);
+ expect(lcpRegionControl.validations.length).toEqual(0);
+ expect(lcpRegionControl.dataTestId).toEqual('lcpRegion');
+ expect(lcpRegionControl.type).toEqual(FormControlType.DROPDOWN);
+ expect(lcpRegionControl.isDisabled).toBeTruthy();
+ expect(lcpRegionControl.placeHolder).toEqual('Select LCP Region');
+ expect(lcpRegionControl.displayName).toEqual('LCP region');
+ expect(lcpRegionControl.onInit).toBeDefined();
+ expect(lcpRegionControl.onChange).toBeDefined();
+
+ const tenantControl: DropdownFormControl = <DropdownFormControl>controls.find(item => item.controlName === FormControlNames.TENANT_ID);
+ expect(tenantControl.validations.length).toEqual(0);
+ expect(tenantControl.dataTestId).toEqual('tenant');
+ expect(tenantControl.type).toEqual(FormControlType.DROPDOWN);
+ expect(tenantControl.isDisabled).toBeTruthy();
+ expect(tenantControl.placeHolder).toEqual('Select Tenant');
+ expect(tenantControl.displayName).toEqual('Tenant');
+ expect(tenantControl.onInit).toBeDefined();
+ expect(tenantControl.onChange).toBeDefined();
+ });
+
+ const isRegionAndTenantOptionalProvider = [
+ [{modelCategory:"Transport"}, true],
+ [{modelCategory:"dontKnow"}, false],
+ [undefined, false],
+ [{}, false]
+ ];
+
+ each(isRegionAndTenantOptionalProvider).test(`isRegionAndTenantOptional shall be as expected`, (vidNotions:VidNotions, expectedResult:boolean)=>{
+ expect(service.isRegionAndTenantOptional(vidNotions)).toEqual(expectedResult);
+ });
+
});
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.ts
index 539f848d5..12054a8a7 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.ts
@@ -2,11 +2,7 @@ import {Injectable} from "@angular/core";
import {GenericFormService} from "../generic-form.service";
import {NgRedux} from "@angular-redux/store";
import {AppState} from "../../../store/reducers";
-import {
- FormControlModel,
- ValidatorModel,
- ValidatorOptions
-} from "../../../models/formControlModels/formControl.model";
+import {FormControlModel, ValidatorModel, ValidatorOptions} from "../../../models/formControlModels/formControl.model";
import {DropdownFormControl} from "../../../models/formControlModels/dropdownFormControl.model";
import * as _ from 'lodash';
import {BasicControlGenerator} from "./basic.control.generator";
@@ -15,12 +11,12 @@ import {FormGroup} from "@angular/forms";
import {FormControlType} from "../../../models/formControlModels/formControlTypes.enum";
import {HttpClient} from "@angular/common/http";
import {SelectOption} from "../../../models/selectOption";
-import {Observable} from "rxjs";
+import {Observable, of} from "rxjs";
import {LogService} from "../../../utils/log/log.service";
import {ServiceModel} from "../../../models/serviceModel";
-import {of} from "rxjs";
import {CheckboxFormControl} from "../../../models/formControlModels/checkboxFormControl.model";
+import {VidNotions} from "../../../models/vidNotions";
export enum FormControlNames {
INSTANCE_NAME = 'instanceName',
@@ -96,10 +92,12 @@ export class ServiceControlGenerator {
result.push(this.getServiceTypeControl(serviceInstance, result, true));
result.push(this.getOwningEntityControl(serviceInstance, result));
result.push(this.getProductFamilyControl(serviceInstance, result));
- result.push(this.getLcpRegionControl(serviceInstance, result));
- result.push(this.getTenantControl(serviceInstance, result),);
+ result.push(this.getLcpRegionControl(serviceInstance, result, serviceModel.vidNotions));
+ result.push(this.getTenantControl(serviceInstance, result, serviceModel.vidNotions),);
result.push(this.getAICZoneControl(serviceInstance, result));
+
+
if(serviceModel.isMultiStepDesign){
result.push(new CheckboxFormControl({
controlName : FormControlNames.PAUSE,
@@ -221,7 +219,11 @@ export class ServiceControlGenerator {
})
};
- getLcpRegionControl = (serviceInstance : any, controls : FormControlModel[]) : DropdownFormControl => {
+ isRegionAndTenantOptional = (vidNotions?: VidNotions) : boolean => {
+ return !_.isNil(vidNotions) && vidNotions.modelCategory === "Transport"
+ };
+
+ getLcpRegionControl = (serviceInstance: any, controls: FormControlModel[], vidNotions?: VidNotions) : DropdownFormControl => {
return new DropdownFormControl({
type : FormControlType.DROPDOWN,
controlName : FormControlNames.LCPCLOUD_REGION_ID,
@@ -231,7 +233,8 @@ export class ServiceControlGenerator {
name : "lcpRegion",
isDisabled : _.isNil(serviceInstance),
value : serviceInstance ? serviceInstance.lcpCloudRegionId : null,
- validations : [new ValidatorModel(ValidatorOptions.required, 'is required')],
+ validations : this.isRegionAndTenantOptional(vidNotions) ? [] :
+ [new ValidatorModel(ValidatorOptions.required, 'is required')],
onInitSelectedField : ['lcpRegionList'],
onInit : serviceInstance ? this._basicControlGenerator.getSubscribeInitResult.bind(
this._aaiService,
@@ -255,7 +258,7 @@ export class ServiceControlGenerator {
})
};
- getTenantControl = (serviceInstance : any, controls : FormControlModel[]) : DropdownFormControl => {
+ getTenantControl = (serviceInstance: any, controls: FormControlModel[], vidNotions?: VidNotions) : DropdownFormControl => {
return new DropdownFormControl({
type : FormControlType.DROPDOWN,
controlName : FormControlNames.TENANT_ID,
@@ -264,12 +267,12 @@ export class ServiceControlGenerator {
placeHolder : 'Select Tenant',
name : "tenant",
isDisabled : _.isNil(serviceInstance),
- onInitSelectedField :serviceInstance ? ['lcpRegionsTenantsMap', serviceInstance.lcpCloudRegionId] : null,
+ onInitSelectedField : serviceInstance ? ['lcpRegionsTenantsMap', serviceInstance.lcpCloudRegionId] : null,
onInit : serviceInstance ? this._basicControlGenerator.getSubscribeInitResult.bind(
this._aaiService,
this.aaiService.getLcpRegionsAndTenants.bind(this, serviceInstance.globalSubscriberId, serviceInstance.subscriptionServiceType)) : ()=>{},
value : serviceInstance ? serviceInstance.tenantId : null,
- validations : [new ValidatorModel(ValidatorOptions.required, 'is required')],
+ validations : this.isRegionAndTenantOptional(vidNotions) ? [] : [new ValidatorModel(ValidatorOptions.required, 'is required')],
})
};
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
index 17689be6e..fbcca06a7 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
@@ -23,15 +23,10 @@ class MockAppStore<T> {
"FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
"FLAG_SHOW_ASSIGNMENTS": true,
"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
- "FLAG_UNASSIGN_SERVICE": true,
"FLAG_SHOW_VERIFY_SERVICE": false,
- "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
- "FLAG_DUPLICATE_VNF": true,
"FLAG_SERVICE_MODEL_CACHE": true,
"CREATE_INSTANCE_TEST": false,
"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
- "FLAG_ASYNC_INSTANTIATION": true,
- "FLAG_ASYNC_JOBS": true,
"EMPTY_DRAWING_BOARD_TEST": false,
"FLAG_ADD_MSO_TESTAPI_FIELD": true
},
@@ -55,11 +50,11 @@ class MockAppStore<T> {
"inputs": {}
},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
- "description": "VSP_vMee",
- "name": "VF_vMee",
+ "description": "VSP_vGeraldine",
+ "name": "VF_vGeraldine",
"version": "2.0",
"customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
"inputs": {},
@@ -231,74 +226,74 @@ class MockAppStore<T> {
"sctp-b-egress-dst_end_port": "65535.0"
},
"type": "VF",
- "modelCustomizationName": "VF_vMee 0",
+ "modelCustomizationName": "VF_vGeraldine 0",
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -327,7 +322,7 @@ class MockAppStore<T> {
"modelCustomizationName": "ExtVL 0"
}
},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {
"Port Mirroring Configuration By Policy 0": {
"uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -348,72 +343,72 @@ class MockAppStore<T> {
},
"serviceProxies": {},
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -425,21 +420,21 @@ class MockAppStore<T> {
"6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
"networks": {},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"rollbackOnFailure": "true",
"vfModules": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
- "vf_vmee0..VfVmee..base_vmme..module-0vmvzo": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo": {
"isMissingData": false,
"sdncPreReload": null,
"modelInfo": {
"modelType": "VFmodule",
"modelInvariantId": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
"modelVersionId": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- "modelName": "VfVmee..base_vmme..module-0",
+ "modelName": "VfVgeraldine..base_vflorence..module-0",
"modelVersion": "2",
"modelCustomizationId": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
- "modelCustomizationName": "VfVmee..base_vmme..module-0"
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0"
},
"instanceParams": [
{}
@@ -449,8 +444,8 @@ class MockAppStore<T> {
}
},
"isMissingData": true,
- "originalName": "VF_vMee 0",
- "vnfStoreKey": "VF_vMee 0",
+ "originalName": "VF_vGeraldine 0",
+ "vnfStoreKey": "VF_vGeraldine 0",
"trackById": "p3wk448m5do",
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -462,9 +457,9 @@ class MockAppStore<T> {
"modelType": "VF",
"modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
"modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
- "modelName": "VF_vMee",
+ "modelName": "VF_vGeraldine",
"modelVersion": "2.0",
- "modelCustomizationName": "VF_vMee 0"
+ "modelCustomizationName": "VF_vGeraldine 0"
}
}
},
@@ -509,8 +504,8 @@ class MockAppStore<T> {
"lcpRegionsAndTenants": {
"lcpRegionList": [
{
- "id": "JANET25",
- "name": "JANET25",
+ "id": "AAIAIC25",
+ "name": "AAIAIC25",
"isPermitted": true
},
{
@@ -520,7 +515,7 @@ class MockAppStore<T> {
}
],
"lcpRegionsTenantsMap": {
- "JANET25": [
+ "AAIAIC25": [
{
"id": "092eb9e8e4b7412e8787dd091bc58e86",
"name": "USP-SIP-IC-24335-T-01",
@@ -534,8 +529,128 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "d0a3e3f2964542259d155a81c41aadc3",
- "name": "test-hvf6-09",
+ "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "name": "AIN Web Tool-15-D-STTest2",
+ "isPermitted": true
+ },
+ {
+ "id": "1178612d2b394be4834ad77f567c0af2",
+ "name": "AIN Web Tool-15-D-SSPtestcustome",
+ "isPermitted": true
+ },
+ {
+ "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+ "name": "AIN Web Tool-15-D-UncheckedEcopm",
+ "isPermitted": true
+ },
+ {
+ "id": "de007636e25249238447264a988a927b",
+ "name": "AIN Web Tool-15-D-dfsdf",
+ "isPermitted": true
+ },
+ {
+ "id": "62f29b3613634ca6a3065cbe0e020c44",
+ "name": "AIN/SMS-16-D-Multiservices1",
+ "isPermitted": true
+ },
+ {
+ "id": "649289e30d3244e0b48098114d63c2aa",
+ "name": "AIN Web Tool-15-D-SSPST66",
+ "isPermitted": true
+ },
+ {
+ "id": "3f21eeea6c2c486bba31dab816c05a32",
+ "name": "AIN Web Tool-15-D-ASSPST47",
+ "isPermitted": true
+ },
+ {
+ "id": "f60ce21d3ee6427586cff0d22b03b773",
+ "name": "CESAR-100-D-sspjg67246",
+ "isPermitted": true
+ },
+ {
+ "id": "8774659e425f479895ae091bb5d46560",
+ "name": "CESAR-100-D-sspjg68359",
+ "isPermitted": true
+ },
+ {
+ "id": "624eb554b0d147c19ff8885341760481",
+ "name": "AINWebTool-15-D-iftach",
+ "isPermitted": true
+ },
+ {
+ "id": "214f55f5fc414c678059c383b03e4962",
+ "name": "CESAR-100-D-sspjg612401",
+ "isPermitted": true
+ },
+ {
+ "id": "c90666c291664841bb98e4d981ff1db5",
+ "name": "CESAR-100-D-sspjg621340",
+ "isPermitted": true
+ },
+ {
+ "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+ "name": "sspjg621351cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "b386b768a3f24c8e953abbe0b3488c02",
+ "name": "AINWebTool-15-D-eteancomp",
+ "isPermitted": true
+ },
+ {
+ "id": "dc6c4dbfd225474e9deaadd34968646c",
+ "name": "AINWebTool-15-T-SPFET",
+ "isPermitted": true
+ },
+ {
+ "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+ "name": "AINWebTool-15-X-eeweww",
+ "isPermitted": true
+ },
+ {
+ "id": "f2f3830e4c984d45bcd00e1a04158a79",
+ "name": "CESAR-100-D-spjg61909",
+ "isPermitted": true
+ },
+ {
+ "id": "05b91bd5137f4929878edd965755c06d",
+ "name": "CESAR-100-D-sspjg621512cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "7002fbe8482d4a989ddf445b1ce336e0",
+ "name": "AINWebTool-15-X-vdr",
+ "isPermitted": true
+ },
+ {
+ "id": "4008522be43741dcb1f5422022a2aa0b",
+ "name": "AINWebTool-15-D-ssasa",
+ "isPermitted": true
+ },
+ {
+ "id": "f44e2e96a1b6476abfda2fa407b00169",
+ "name": "AINWebTool-15-D-PFNPT",
+ "isPermitted": true
+ },
+ {
+ "id": "b69a52bec8a84669a37a1e8b72708be7",
+ "name": "AINWebTool-15-X-vdre",
+ "isPermitted": true
+ },
+ {
+ "id": "fac7d9fd56154caeb9332202dcf2969f",
+ "name": "AINWebTool-15-X-NONPODECOMP",
+ "isPermitted": true
+ },
+ {
+ "id": "2d34d8396e194eb49969fd61ffbff961",
+ "name": "DN5242-Nov16-T5",
+ "isPermitted": true
+ },
+ {
+ "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+ "name": "ro-T11",
"isPermitted": true
},
{
@@ -544,6 +659,16 @@ class MockAppStore<T> {
"isPermitted": true
},
{
+ "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+ "name": "DN5242-Nov21-T1",
+ "isPermitted": true
+ },
+ {
+ "id": "d0a3e3f2964542259d155a81c41aadc3",
+ "name": "test-hvf6-09",
+ "isPermitted": true
+ },
+ {
"id": "cbb99fe4ada84631b7baf046b6fd2044",
"name": "DN5242-Nov16-T3",
"isPermitted": true
@@ -554,7 +679,7 @@ class MockAppStore<T> {
"productFamilies": [
{
"id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
- "name": "SCOTTIE",
+ "name": "ERICA",
"isPermitted": true
},
{
@@ -579,7 +704,7 @@ class MockAppStore<T> {
},
{
"id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": true
},
{
@@ -623,7 +748,7 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "Cisneros",
+ "id": "vMuriel",
"name": "vMuriel",
"isPermitted": true
},
@@ -649,7 +774,7 @@ class MockAppStore<T> {
},
{
"id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
- "name": "Josefina",
+ "name": "JOSEFINA",
"isPermitted": true
},
{
@@ -697,7 +822,7 @@ class MockAppStore<T> {
},
{
"id": "6",
- "name": "vSEGW",
+ "name": "vPorfirio",
"isPermitted": false
},
{
@@ -712,7 +837,7 @@ class MockAppStore<T> {
},
{
"id": "9",
- "name": "vMME",
+ "name": "vFLORENCE",
"isPermitted": false
},
{
@@ -722,7 +847,7 @@ class MockAppStore<T> {
},
{
"id": "11",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": false
},
{
@@ -732,7 +857,7 @@ class MockAppStore<T> {
},
{
"id": "13",
- "name": "vMMSC",
+ "name": "vWINIFRED",
"isPermitted": false
},
{
@@ -776,6 +901,754 @@ class MockAppStore<T> {
"name": "UUUAIAAI-YYY1"
},
{
+ "id": "BAN1",
+ "name": "VSDKYUTP-BAN1"
+ },
+ {
+ "id": "DKJ1",
+ "name": "DKJSJDKA-DKJ1"
+ },
+ {
+ "id": "MCS1",
+ "name": "ASACMAMS-MCS1"
+ },
+ {
+ "id": "UIO1",
+ "name": "uioclli1-UIO1"
+ },
+ {
+ "id": "RAJ1",
+ "name": "YGBIJNLQ-RAJ1"
+ },
+ {
+ "id": "OPA1",
+ "name": "opaclli1-OPA1"
+ },
+ {
+ "id": "SDE1",
+ "name": "ZXCVBNMA-SDE1"
+ },
+ {
+ "id": "VEN2",
+ "name": "FGHJUHIL-VEN2"
+ },
+ {
+ "id": "ORL1",
+ "name": "ORLDFLMA-ORL1"
+ },
+ {
+ "id": "JAD1",
+ "name": "JADECLLI-JAD1"
+ },
+ {
+ "id": "ZXL1",
+ "name": "LWLWCANN-ZXL1"
+ },
+ {
+ "id": "CKL1",
+ "name": "CLKSKCKK-CKL1"
+ },
+ {
+ "id": "SDF1",
+ "name": "sdfclli1-SDF1"
+ },
+ {
+ "id": "RAD1",
+ "name": "RADICAL1-RAD1"
+ },
+ {
+ "id": "KIT1",
+ "name": "BHYJFGLN-KIT1"
+ },
+ {
+ "id": "REL1",
+ "name": "INGERFGT-REL1"
+ },
+ {
+ "id": "JNL1",
+ "name": "CJALSDAC-JNL1"
+ },
+ {
+ "id": "OLK1",
+ "name": "OLKOLKLS-OLK1"
+ },
+ {
+ "id": "CHI1",
+ "name": "CHILLIWE-CHI1"
+ },
+ {
+ "id": "UUU4",
+ "name": "UUUAAAUU-UUU4"
+ },
+ {
+ "id": "TUF1",
+ "name": "TUFCLLI1-TUF1"
+ },
+ {
+ "id": "KJN1",
+ "name": "CKALDKSA-KJN1"
+ },
+ {
+ "id": "SAM1",
+ "name": "SNDGCA64-SAN1"
+ },
+ {
+ "id": "SCK1",
+ "name": "SCKSCKSK-SCK1"
+ },
+ {
+ "id": "HJH1",
+ "name": "AOEEQQQD-HJH1"
+ },
+ {
+ "id": "HGD1",
+ "name": "SDFQWHGD-HGD1"
+ },
+ {
+ "id": "KOR1",
+ "name": "HYFLNBVT-KOR1"
+ },
+ {
+ "id": "ATL43",
+ "name": "AICLOCID-ATL43"
+ },
+ {
+ "id": "ATL54",
+ "name": "AICFTAAI-ATL54"
+ },
+ {
+ "id": "ATL66",
+ "name": "CLLIAAII-ATL66"
+ },
+ {
+ "id": "VEL1",
+ "name": "BNMLKUIK-VEL1"
+ },
+ {
+ "id": "ICC1",
+ "name": "SANJITAT-ICC1"
+ },
+ {
+ "id": "MNT11",
+ "name": "WSXEFBTH-MNT11"
+ },
+ {
+ "id": "DEF2",
+ "name": "WSBHGTYL-DEF2"
+ },
+ {
+ "id": "MAD11",
+ "name": "SDFQWGKL-MAD11"
+ },
+ {
+ "id": "OLG1",
+ "name": "OLHOLHOL-OLG1"
+ },
+ {
+ "id": "GAR1",
+ "name": "NGFVSJKO-GAR1"
+ },
+ {
+ "id": "SAN22",
+ "name": "GNVLSCTL-SAN22"
+ },
+ {
+ "id": "HRG1",
+ "name": "HRGHRGGS-HRG1"
+ },
+ {
+ "id": "JCS1",
+ "name": "JCSJSCJS-JCS1"
+ },
+ {
+ "id": "DHA12",
+ "name": "WSXEDECF-DHA12"
+ },
+ {
+ "id": "HJE1",
+ "name": "AOEEWWWD-HJE1"
+ },
+ {
+ "id": "NCA1",
+ "name": "NCANCANN-NCA1"
+ },
+ {
+ "id": "IOP1",
+ "name": "iopclli1-IOP1"
+ },
+ {
+ "id": "RTY1",
+ "name": "rtyclli1-RTY1"
+ },
+ {
+ "id": "KAP1",
+ "name": "HIOUYTRQ-KAP1"
+ },
+ {
+ "id": "ZEN1",
+ "name": "ZENCLLI1-ZEN1"
+ },
+ {
+ "id": "HKA1",
+ "name": "JAKHLASS-HKA1"
+ },
+ {
+ "id": "CQK1",
+ "name": "CQKSCAKK-CQK1"
+ },
+ {
+ "id": "SAI1",
+ "name": "UBEKQLPD-SAI1"
+ },
+ {
+ "id": "ERT1",
+ "name": "ertclli1-ERT1"
+ },
+ {
+ "id": "IBB1",
+ "name": "PLMKOIJU-IBB1"
+ },
+ {
+ "id": "TIR2",
+ "name": "PLKINHYI-TIR2"
+ },
+ {
+ "id": "HSD1",
+ "name": "CHASKCDS-HSD1"
+ },
+ {
+ "id": "SLF78",
+ "name": "SDCTLFN1-SLF78"
+ },
+ {
+ "id": "SEE78",
+ "name": "SDCTEEE4-SEE78"
+ },
+ {
+ "id": "SAN13",
+ "name": "TOKYJPFA-SAN13"
+ },
+ {
+ "id": "SAA78",
+ "name": "SDCTAAA1-SAA78"
+ },
+ {
+ "id": "LUC1",
+ "name": "ATLDFGYC-LUC1"
+ },
+ {
+ "id": "AMD13",
+ "name": "MEMATLAN-AMD13"
+ },
+ {
+ "id": "TOR1",
+ "name": "TOROONXN-TOR1"
+ },
+ {
+ "id": "QWE1",
+ "name": "QWECLLI1-QWE1"
+ },
+ {
+ "id": "ZOG1",
+ "name": "ZOGASTRO-ZOG1"
+ },
+ {
+ "id": "CAL33",
+ "name": "CALIFORN-CAL33"
+ },
+ {
+ "id": "SHH78",
+ "name": "SDIT1HHH-SHH78"
+ },
+ {
+ "id": "DSA1",
+ "name": "LKJHGFDS-DSA1"
+ },
+ {
+ "id": "CLG1",
+ "name": "CLGRABAD-CLG1"
+ },
+ {
+ "id": "BNA1",
+ "name": "BNARAGBK-BNA1"
+ },
+ {
+ "id": "ATL84",
+ "name": "CANTTCOC-ATL84"
+ },
+ {
+ "id": "APP1",
+ "name": "WBHGTYUI-APP1"
+ },
+ {
+ "id": "RJN1",
+ "name": "RJNRBZAW-RJN1"
+ },
+ {
+ "id": "EHH78",
+ "name": "SDCSHHH5-EHH78"
+ },
+ {
+ "id": "mac10",
+ "name": "PKGTESTF-mac10"
+ },
+ {
+ "id": "SXB78",
+ "name": "SDCTGXB1-SXB78"
+ },
+ {
+ "id": "SAX78",
+ "name": "SDCTAXG1-SAX78"
+ },
+ {
+ "id": "SYD1",
+ "name": "SYDNAUBV-SYD1"
+ },
+ {
+ "id": "TOK1",
+ "name": "TOKYJPFA-TOK1"
+ },
+ {
+ "id": "KGM2",
+ "name": "KGMTNC20-KGM2"
+ },
+ {
+ "id": "DCC1b",
+ "name": "POIUYTGH-DCC1b"
+ },
+ {
+ "id": "SKK78",
+ "name": "SDCTKKK1-SKK78"
+ },
+ {
+ "id": "SGG78",
+ "name": "SDCTGGG1-SGG78"
+ },
+ {
+ "id": "SJJ78",
+ "name": "SDCTJJJ1-SJJ78"
+ },
+ {
+ "id": "SBX78",
+ "name": "SDCTBXG1-SBX78"
+ },
+ {
+ "id": "LAG1",
+ "name": "LARGIZON-LAG1"
+ },
+ {
+ "id": "IAA1",
+ "name": "QAZXSWED-IAA1"
+ },
+ {
+ "id": "POI1",
+ "name": "PLMNJKIU-POI1"
+ },
+ {
+ "id": "LAG1a",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "PBL1",
+ "name": "PBLAPBAI-PBL1"
+ },
+ {
+ "id": "LAG45",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "MAR1",
+ "name": "MNBVCXZM-MAR1"
+ },
+ {
+ "id": "HST70",
+ "name": "HSTNTX70-HST70"
+ },
+ {
+ "id": "DCC1a",
+ "name": "POIUYTGH-DCC1a"
+ },
+ {
+ "id": "TOL1",
+ "name": "TOLDOH21-TOL1"
+ },
+ {
+ "id": "LON1",
+ "name": "LONEENCO-LON1"
+ },
+ {
+ "id": "SJU78",
+ "name": "SDIT1JUB-SJU78"
+ },
+ {
+ "id": "STN27",
+ "name": "HSTNTX01-STN27"
+ },
+ {
+ "id": "SSW56",
+ "name": "ss8126GT-SSW56"
+ },
+ {
+ "id": "SBB78",
+ "name": "SDIT1BBB-SBB78"
+ },
+ {
+ "id": "DCC3",
+ "name": "POIUYTGH-DCC3"
+ },
+ {
+ "id": "GNV1",
+ "name": "GNVLSCTL-GNV1"
+ },
+ {
+ "id": "WAS1",
+ "name": "WASHDCSW-WAS1"
+ },
+ {
+ "id": "TOY1",
+ "name": "TORYONNZ-TOY1"
+ },
+ {
+ "id": "STT1",
+ "name": "STTLWA02-STT1"
+ },
+ {
+ "id": "STG1",
+ "name": "STTGGE62-STG1"
+ },
+ {
+ "id": "SLL78",
+ "name": "SDCTLLL1-SLL78"
+ },
+ {
+ "id": "SBU78",
+ "name": "SDIT1BUB-SBU78"
+ },
+ {
+ "id": "ATL2",
+ "name": "ATLNGANW-ATL2"
+ },
+ {
+ "id": "BOT1",
+ "name": "BOTHWAKY-BOT1"
+ },
+ {
+ "id": "SNG1",
+ "name": "SNGPSIAU-SNG1"
+ },
+ {
+ "id": "NYC1",
+ "name": "NYCMNY54-NYC1"
+ },
+ {
+ "id": "LAG1b",
+ "name": "LARGIZON-LAG1b"
+ },
+ {
+ "id": "AMD15",
+ "name": "AMDFAA01-AMD15"
+ },
+ {
+ "id": "SNA1",
+ "name": "SNANTXCA-SNA1"
+ },
+ {
+ "id": "PLT1",
+ "name": "PLTNCA60-PLT1"
+ },
+ {
+ "id": "TLP1",
+ "name": "TLPNXM18-TLP1"
+ },
+ {
+ "id": "SDD81",
+ "name": "SAIT1DD6-SDD81"
+ },
+ {
+ "id": "DCC1",
+ "name": "POIUYTGH-DCC1"
+ },
+ {
+ "id": "DCC2",
+ "name": "POIUYTGH-DCC2"
+ },
+ {
+ "id": "OKC1",
+ "name": "OKCBOK55-OKC1"
+ },
+ {
+ "id": "PAR1",
+ "name": "PARSFRCG-PAR1"
+ },
+ {
+ "id": "TES36",
+ "name": "ABCEETES-TES36"
+ },
+ {
+ "id": "COM1",
+ "name": "PLMKOPIU-COM1"
+ },
+ {
+ "id": "ANI1",
+ "name": "ATLNGTRE-ANI1"
+ },
+ {
+ "id": "SDG78",
+ "name": "SDIT1BDG-SDG78"
+ },
+ {
+ "id": "mac20",
+ "name": "PKGTESTF-mac20"
+ },
+ {
+ "id": "DSF45",
+ "name": "DSFBG123-DSF45"
+ },
+ {
+ "id": "HST25",
+ "name": "HSTNTX01-HST25"
+ },
+ {
+ "id": "AMD18",
+ "name": "AUDIMA01-AMD18"
+ },
+ {
+ "id": "SAA80",
+ "name": "SAIT9AA3-SAA80"
+ },
+ {
+ "id": "SSA56",
+ "name": "SSIT2AA7-SSA56"
+ },
+ {
+ "id": "SDD82",
+ "name": "SAIT1DD9-SDD82"
+ },
+ {
+ "id": "JCV1",
+ "name": "JCVLFLBW-JCV1"
+ },
+ {
+ "id": "SUL2",
+ "name": "WERTYUJK-SUL2"
+ },
+ {
+ "id": "PUR1",
+ "name": "purelyde-PUR1"
+ },
+ {
+ "id": "FDE55",
+ "name": "FDERT555-FDE55"
+ },
+ {
+ "id": "SITE",
+ "name": "LONEENCO-SITE"
+ },
+ {
+ "id": "ATL1",
+ "name": "ATLNGAMA-ATL1"
+ },
+ {
+ "id": "JUL1",
+ "name": "ZXCVBNMM-JUL1"
+ },
+ {
+ "id": "TAT34",
+ "name": "TESAAISB-TAT34"
+ },
+ {
+ "id": "XCP12",
+ "name": "CHKGH123-XCP12"
+ },
+ {
+ "id": "RAI1",
+ "name": "poiuytre-RAI1"
+ },
+ {
+ "id": "HPO1",
+ "name": "ATLNGAUP-HPO1"
+ },
+ {
+ "id": "KJF12",
+ "name": "KJFDH123-KJF12"
+ },
+ {
+ "id": "SCC80",
+ "name": "SAIT9CC3-SCC80"
+ },
+ {
+ "id": "SAA12",
+ "name": "SAIT9AF8-SAA12"
+ },
+ {
+ "id": "SAA14",
+ "name": "SAIT1AA9-SAA14"
+ },
+ {
+ "id": "ATL35",
+ "name": "TTESSAAI-ATL35"
+ },
+ {
+ "id": "CWY1",
+ "name": "CWYMOWBS-CWY1"
+ },
+ {
+ "id": "ATL76",
+ "name": "TELEPAAI-ATL76"
+ },
+ {
+ "id": "DSL12",
+ "name": "DSLFK242-DSL12"
+ },
+ {
+ "id": "ATL53",
+ "name": "AAIATLTE-ATL53"
+ },
+ {
+ "id": "SAA11",
+ "name": "SAIT9AA2-SAA11"
+ },
+ {
+ "id": "ATL62",
+ "name": "TESSASCH-ATL62"
+ },
+ {
+ "id": "AUG1",
+ "name": "ASDFGHJK-AUG1"
+ },
+ {
+ "id": "POI22",
+ "name": "POIUY123-POI22"
+ },
+ {
+ "id": "SAA13",
+ "name": "SAIT1AA9-SAA13"
+ },
+ {
+ "id": "BHY17",
+ "name": "BHYTFRF3-BHY17"
+ },
+ {
+ "id": "LIS1",
+ "name": "HOSTPROF-LIS1"
+ },
+ {
+ "id": "SIP1",
+ "name": "ZXCVBNMK-SIP1"
+ },
+ {
+ "id": "ATL99",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "ATL64",
+ "name": "FORLOAAJ-ATL64"
+ },
+ {
+ "id": "TAT33",
+ "name": "TESAAISA-TAT33"
+ },
+ {
+ "id": "RAD10",
+ "name": "INDIPUNE-RAD10"
+ },
+ {
+ "id": "RTW5",
+ "name": "BHYTFRY4-RTW5"
+ },
+ {
+ "id": "JGS1",
+ "name": "KSJKKKKK-JGS1"
+ },
+ {
+ "id": "ATL98",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "WAN1",
+ "name": "LEIWANGW-WAN1"
+ },
+ {
+ "id": "ATL44",
+ "name": "ATLSANAB-ATL44"
+ },
+ {
+ "id": "RTD2",
+ "name": "BHYTFRk4-RTD2"
+ },
+ {
+ "id": "NIR1",
+ "name": "ORFLMANA-NIR1"
+ },
+ {
+ "id": "ATL75",
+ "name": "SANAAIRE-ATL75"
+ },
+ {
+ "id": "NUM1",
+ "name": "QWERTYUI-NUM1"
+ },
+ {
+ "id": "hvf32",
+ "name": "MDTWNJ21-hvf32"
+ },
+ {
+ "id": "RTZ4",
+ "name": "BHYTFRZ6-RTZ4"
+ },
+ {
+ "id": "ATL56",
+ "name": "ATLSANAC-ATL56"
+ },
+ {
+ "id": "AMS1",
+ "name": "AMSTNLBW-AMS1"
+ },
+ {
+ "id": "RCT1",
+ "name": "AMSTERNL-RCT1"
+ },
+ {
+ "id": "JAN1",
+ "name": "ORFLMATT-JAN1"
+ },
+ {
+ "id": "ABC14",
+ "name": "TESAAISA-ABC14"
+ },
+ {
+ "id": "TAT37",
+ "name": "TESAAISD-TAT37"
+ },
+ {
+ "id": "MIC54",
+ "name": "MICHIGAN-MIC54"
+ },
+ {
+ "id": "ABC11",
+ "name": "ATLSANAI-ABC11"
+ },
+ {
+ "id": "AMF11",
+ "name": "AMDOCS01-AMF11"
+ },
+ {
+ "id": "ATL63",
+ "name": "ATLSANEW-ATL63"
+ },
+ {
+ "id": "ABC12",
+ "name": "ATLSECIA-ABC12"
+ },
+ {
+ "id": "hvf20",
+ "name": "MDTWNJ21-hvf20"
+ },
+ {
+ "id": "ABC15",
+ "name": "AAITESAN-ABC15"
+ },
+ {
"id": "AVT1",
"name": "AVTRFLHD-AVT1"
},
@@ -948,7 +1821,7 @@ describe('VFModule Control Generator', () => {
test(' getMacroFormControls gets vnfStoreKey === null', () => {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
const vnfStoreKey: string = null;
- const vfModuleStoreKey: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
+ const vfModuleStoreKey: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
const vfModuleUUID: string = "522159d5-d6e0-4c2a-aa44-5a542a12a830";
const controls: FormControlModel[] = service.getMacroFormControls(serviceId, vnfStoreKey, vfModuleStoreKey, vfModuleUUID, true);
@@ -958,15 +1831,15 @@ describe('VFModule Control Generator', () => {
test('getAlaCarteFormControls check for mandatory controls', () => {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfStoreKey: string = 'VF_vMee 0';
- const vfModuleStoreKey: string = 'vf_vmee0..VfVmee..base_vmme..module-0';
+ const vnfStoreKey: string = 'VF_vGeraldine 0';
+ const vfModuleStoreKey: string = 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0';
const uuidData: Object = {
modelId : "522159d5-d6e0-4c2a-aa44-5a542a12a830",
- modelName : "vf_vmee0..VfVmee..base_vmme..module-0",
+ modelName : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0",
serviceId : "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
type : "VFmodule",
- vFModuleStoreKey : "vf_vmee0..VfVmee..base_vmme..module-0vmvzo",
- vnfStoreKey : "VF_vMee 0"
+ vFModuleStoreKey : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo",
+ vnfStoreKey : "VF_vGeraldine 0"
};
const controls: FormControlModel[] = service.getAlaCarteFormControls(serviceId, vnfStoreKey, vfModuleStoreKey, uuidData, true);
@@ -985,14 +1858,14 @@ describe('VFModule Control Generator', () => {
test('getMacroFormControls check for mandatory controls', () => {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfStoreKey: string = 'VF_vMee 0';
+ const vnfStoreKey: string = 'VF_vGeraldine 0';
const uuidData: Object = {
modelId : "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- modelName : "vf_vmee0..VfVmee..base_vmme..module-0",
+ modelName : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0",
serviceId : "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
type : "VFmodule",
- vFModuleStoreKey : "vf_vmee0..VfVmee..base_vmme..module-0vmvzo",
- vnfStoreKey : "VF_vMee 0"
+ vFModuleStoreKey : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo",
+ vnfStoreKey : "VF_vGeraldine 0"
};
const controls: FormControlModel[] = service.getMacroFormControls(serviceId, vnfStoreKey, vnfStoreKey, uuidData, true);
@@ -1038,15 +1911,15 @@ describe('VFModule Control Generator', () => {
function getAlaCarteFormControls():FormControlModel[] {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfStoreKey: string = 'VF_vMee 0';
+ const vnfStoreKey: string = 'VF_vGeraldine 0';
const vfModuleUUID: string = "522159d5-d6e0-4c2a-aa44-5a542a12a830";
const uuidData: Object = {
modelId: "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- modelName: "vf_vmee0..VfVmee..base_vmme..module-0",
+ modelName: "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0",
serviceId: "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
type: "VFmodule",
- vFModuleStoreKey: "vf_vmee0..VfVmee..base_vmme..module-0vmvzo",
- vnfStoreKey: "VF_vMee 0"
+ vFModuleStoreKey: "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo",
+ vnfStoreKey: "VF_vGeraldine 0"
};
const controls: FormControlModel[] = service.getAlaCarteFormControls(serviceId, vnfStoreKey, vfModuleUUID, uuidData, true);
return controls;
@@ -1074,15 +1947,15 @@ describe('VFModule Control Generator', () => {
test('getMacroFormControls should return the correct order of controls', () => {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfStoreKey: string = 'VF_vMee 0';
+ const vnfStoreKey: string = 'VF_vGeraldine 0';
const vfModuleUUID: string = "522159d5-d6e0-4c2a-aa44-5a542a12a830";
const uuidData: Object = {
modelId : "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- modelName : "vf_vmee0..VfVmee..base_vmme..module-0",
+ modelName : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0",
serviceId : "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
type : "VFmodule",
- vFModuleStoreKey : "vf_vmee0..VfVmee..base_vmme..module-0vmvzo",
- vnfStoreKey : "VF_vMee 0"
+ vFModuleStoreKey : "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo",
+ vnfStoreKey : "VF_vGeraldine 0"
};
const controls: FormControlModel[] = service.getMacroFormControls(serviceId, vnfStoreKey, vfModuleUUID, uuidData, true);
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
index d80ccde64..a99856c52 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
@@ -26,15 +26,10 @@ class MockAppStore<T> {
"FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
"FLAG_SHOW_ASSIGNMENTS": true,
"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
- "FLAG_UNASSIGN_SERVICE": true,
"FLAG_SHOW_VERIFY_SERVICE": false,
- "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
- "FLAG_DUPLICATE_VNF": true,
"FLAG_SERVICE_MODEL_CACHE": true,
"CREATE_INSTANCE_TEST": false,
"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
- "FLAG_ASYNC_INSTANTIATION": true,
- "FLAG_ASYNC_JOBS": true,
"EMPTY_DRAWING_BOARD_TEST": false,
"FLAG_ADD_MSO_TESTAPI_FIELD": true
},
@@ -58,11 +53,11 @@ class MockAppStore<T> {
"inputs": {}
},
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
- "description": "VSP_vMee",
- "name": "VF_vMee",
+ "description": "VSP_vGeraldine",
+ "name": "VF_vGeraldine",
"version": "2.0",
"customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
"inputs": {},
@@ -233,74 +228,74 @@ class MockAppStore<T> {
"sctp-b-egress-dst_end_port": "65535.0"
},
"type": "VF",
- "modelCustomizationName": "VF_vMee 0",
+ "modelCustomizationName": "VF_vGeraldine 0",
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -328,7 +323,7 @@ class MockAppStore<T> {
"modelCustomizationName": "ExtVL 0"
}
},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {
"Port Mirroring Configuration By Policy 0": {
"uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
@@ -349,72 +344,72 @@ class MockAppStore<T> {
},
"serviceProxies": {},
"vfModules": {
- "vf_vmee0..VfVmee..vmme_vlc..module-1": {
+ "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": "VfVmee..vmme_vlc..module-1",
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_vlc..module-1",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_vlc"
+ "vfModuleLabel": "vflorence_vlc"
},
"inputs": {},
"volumeGroupAllowed": true
},
- "vf_vmee0..VfVmee..vmme_gpb..module-2": {
+ "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": "VfVmee..vmme_gpb..module-2",
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
"version": "2",
- "modelCustomizationName": "VfVmee..vmme_gpb..module-2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
"properties": {
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "vmme_gpb"
+ "vfModuleLabel": "vflorence_gpb"
},
"inputs": {},
"volumeGroupAllowed": false
},
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {},
"volumeGroupAllowed": true
}
},
"volumeGroups": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
+ "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": "VfVmee..base_vmme..module-0",
+ "name": "VfVgeraldine..base_vflorence..module-0",
"version": "2",
- "modelCustomizationName": "VfVmee..base_vmme..module-0",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
"properties": {
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "base_vmme"
+ "vfModuleLabel": "base_vflorence"
},
"inputs": {}
}
@@ -425,21 +420,21 @@ class MockAppStore<T> {
"serviceInstance": {
"6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
"vnfs": {
- "VF_vMee 0": {
+ "VF_vGeraldine 0": {
"rollbackOnFailure": "true",
"vfModules": {
- "vf_vmee0..VfVmee..base_vmme..module-0": {
- "vf_vmee0..VfVmee..base_vmme..module-0vmvzo": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0vmvzo": {
"isMissingData": false,
"sdncPreReload": null,
"modelInfo": {
"modelType": "VFmodule",
"modelInvariantId": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
"modelVersionId": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
- "modelName": "VfVmee..base_vmme..module-0",
+ "modelName": "VfVgeraldine..base_vflorence..module-0",
"modelVersion": "2",
"modelCustomizationId": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
- "modelCustomizationName": "VfVmee..base_vmme..module-0"
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0"
},
"instanceParams": [
{}
@@ -449,8 +444,8 @@ class MockAppStore<T> {
}
},
"isMissingData": true,
- "originalName": "VF_vMee 0",
- "vnfStoreKey": "VF_vMee 0",
+ "originalName": "VF_vGeraldine 0",
+ "vnfStoreKey": "VF_vGeraldine 0",
"trackById": "p3wk448m5do",
"uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
"productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
@@ -462,9 +457,9 @@ class MockAppStore<T> {
"modelType": "VF",
"modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
"modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
- "modelName": "VF_vMee",
+ "modelName": "VF_vGeraldine",
"modelVersion": "2.0",
- "modelCustomizationName": "VF_vMee 0"
+ "modelCustomizationName": "VF_vGeraldine 0"
}
}
},
@@ -508,8 +503,8 @@ class MockAppStore<T> {
"lcpRegionsAndTenants": {
"lcpRegionList": [
{
- "id": "JANET25",
- "name": "JANET25",
+ "id": "AAIAIC25",
+ "name": "AAIAIC25",
"isPermitted": true
},
{
@@ -519,7 +514,7 @@ class MockAppStore<T> {
}
],
"lcpRegionsTenantsMap": {
- "JANET25": [
+ "AAIAIC25": [
{
"id": "092eb9e8e4b7412e8787dd091bc58e86",
"name": "USP-SIP-IC-24335-T-01",
@@ -533,8 +528,128 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "d0a3e3f2964542259d155a81c41aadc3",
- "name": "test-hvf6-09",
+ "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "name": "AIN Web Tool-15-D-STTest2",
+ "isPermitted": true
+ },
+ {
+ "id": "1178612d2b394be4834ad77f567c0af2",
+ "name": "AIN Web Tool-15-D-SSPtestcustome",
+ "isPermitted": true
+ },
+ {
+ "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+ "name": "AIN Web Tool-15-D-UncheckedEcopm",
+ "isPermitted": true
+ },
+ {
+ "id": "de007636e25249238447264a988a927b",
+ "name": "AIN Web Tool-15-D-dfsdf",
+ "isPermitted": true
+ },
+ {
+ "id": "62f29b3613634ca6a3065cbe0e020c44",
+ "name": "AIN/SMS-16-D-Multiservices1",
+ "isPermitted": true
+ },
+ {
+ "id": "649289e30d3244e0b48098114d63c2aa",
+ "name": "AIN Web Tool-15-D-SSPST66",
+ "isPermitted": true
+ },
+ {
+ "id": "3f21eeea6c2c486bba31dab816c05a32",
+ "name": "AIN Web Tool-15-D-ASSPST47",
+ "isPermitted": true
+ },
+ {
+ "id": "f60ce21d3ee6427586cff0d22b03b773",
+ "name": "CESAR-100-D-sspjg67246",
+ "isPermitted": true
+ },
+ {
+ "id": "8774659e425f479895ae091bb5d46560",
+ "name": "CESAR-100-D-sspjg68359",
+ "isPermitted": true
+ },
+ {
+ "id": "624eb554b0d147c19ff8885341760481",
+ "name": "AINWebTool-15-D-iftach",
+ "isPermitted": true
+ },
+ {
+ "id": "214f55f5fc414c678059c383b03e4962",
+ "name": "CESAR-100-D-sspjg612401",
+ "isPermitted": true
+ },
+ {
+ "id": "c90666c291664841bb98e4d981ff1db5",
+ "name": "CESAR-100-D-sspjg621340",
+ "isPermitted": true
+ },
+ {
+ "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+ "name": "sspjg621351cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "b386b768a3f24c8e953abbe0b3488c02",
+ "name": "AINWebTool-15-D-eteancomp",
+ "isPermitted": true
+ },
+ {
+ "id": "dc6c4dbfd225474e9deaadd34968646c",
+ "name": "AINWebTool-15-T-SPFET",
+ "isPermitted": true
+ },
+ {
+ "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+ "name": "AINWebTool-15-X-eeweww",
+ "isPermitted": true
+ },
+ {
+ "id": "f2f3830e4c984d45bcd00e1a04158a79",
+ "name": "CESAR-100-D-spjg61909",
+ "isPermitted": true
+ },
+ {
+ "id": "05b91bd5137f4929878edd965755c06d",
+ "name": "CESAR-100-D-sspjg621512cloned",
+ "isPermitted": true
+ },
+ {
+ "id": "7002fbe8482d4a989ddf445b1ce336e0",
+ "name": "AINWebTool-15-X-vdr",
+ "isPermitted": true
+ },
+ {
+ "id": "4008522be43741dcb1f5422022a2aa0b",
+ "name": "AINWebTool-15-D-ssasa",
+ "isPermitted": true
+ },
+ {
+ "id": "f44e2e96a1b6476abfda2fa407b00169",
+ "name": "AINWebTool-15-D-PFNPT",
+ "isPermitted": true
+ },
+ {
+ "id": "b69a52bec8a84669a37a1e8b72708be7",
+ "name": "AINWebTool-15-X-vdre",
+ "isPermitted": true
+ },
+ {
+ "id": "fac7d9fd56154caeb9332202dcf2969f",
+ "name": "AINWebTool-15-X-NONPODECOMP",
+ "isPermitted": true
+ },
+ {
+ "id": "2d34d8396e194eb49969fd61ffbff961",
+ "name": "DN5242-Nov16-T5",
+ "isPermitted": true
+ },
+ {
+ "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+ "name": "ro-T11",
"isPermitted": true
},
{
@@ -543,6 +658,16 @@ class MockAppStore<T> {
"isPermitted": true
},
{
+ "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+ "name": "DN5242-Nov21-T1",
+ "isPermitted": true
+ },
+ {
+ "id": "d0a3e3f2964542259d155a81c41aadc3",
+ "name": "test-hvf6-09",
+ "isPermitted": true
+ },
+ {
"id": "cbb99fe4ada84631b7baf046b6fd2044",
"name": "DN5242-Nov16-T3",
"isPermitted": true
@@ -553,7 +678,7 @@ class MockAppStore<T> {
"productFamilies": [
{
"id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
- "name": "SCOTTIE",
+ "name": "ERICA",
"isPermitted": true
},
{
@@ -578,7 +703,7 @@ class MockAppStore<T> {
},
{
"id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": true
},
{
@@ -622,7 +747,7 @@ class MockAppStore<T> {
"isPermitted": true
},
{
- "id": "Cisneros",
+ "id": "vMuriel",
"name": "vMuriel",
"isPermitted": true
},
@@ -648,7 +773,7 @@ class MockAppStore<T> {
},
{
"id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
- "name": "Josefina",
+ "name": "JOSEFINA",
"isPermitted": true
},
{
@@ -696,7 +821,7 @@ class MockAppStore<T> {
},
{
"id": "6",
- "name": "vSEGW",
+ "name": "vPorfirio",
"isPermitted": false
},
{
@@ -711,7 +836,7 @@ class MockAppStore<T> {
},
{
"id": "9",
- "name": "vMME",
+ "name": "vFLORENCE",
"isPermitted": false
},
{
@@ -721,7 +846,7 @@ class MockAppStore<T> {
},
{
"id": "11",
- "name": "vSCP",
+ "name": "vEsmeralda",
"isPermitted": false
},
{
@@ -731,7 +856,7 @@ class MockAppStore<T> {
},
{
"id": "13",
- "name": "vMMSC",
+ "name": "vWINIFRED",
"isPermitted": false
},
{
@@ -775,6 +900,754 @@ class MockAppStore<T> {
"name": "UUUAIAAI-YYY1"
},
{
+ "id": "BAN1",
+ "name": "VSDKYUTP-BAN1"
+ },
+ {
+ "id": "DKJ1",
+ "name": "DKJSJDKA-DKJ1"
+ },
+ {
+ "id": "MCS1",
+ "name": "ASACMAMS-MCS1"
+ },
+ {
+ "id": "UIO1",
+ "name": "uioclli1-UIO1"
+ },
+ {
+ "id": "RAJ1",
+ "name": "YGBIJNLQ-RAJ1"
+ },
+ {
+ "id": "OPA1",
+ "name": "opaclli1-OPA1"
+ },
+ {
+ "id": "SDE1",
+ "name": "ZXCVBNMA-SDE1"
+ },
+ {
+ "id": "VEN2",
+ "name": "FGHJUHIL-VEN2"
+ },
+ {
+ "id": "ORL1",
+ "name": "ORLDFLMA-ORL1"
+ },
+ {
+ "id": "JAD1",
+ "name": "JADECLLI-JAD1"
+ },
+ {
+ "id": "ZXL1",
+ "name": "LWLWCANN-ZXL1"
+ },
+ {
+ "id": "CKL1",
+ "name": "CLKSKCKK-CKL1"
+ },
+ {
+ "id": "SDF1",
+ "name": "sdfclli1-SDF1"
+ },
+ {
+ "id": "RAD1",
+ "name": "RADICAL1-RAD1"
+ },
+ {
+ "id": "KIT1",
+ "name": "BHYJFGLN-KIT1"
+ },
+ {
+ "id": "REL1",
+ "name": "INGERFGT-REL1"
+ },
+ {
+ "id": "JNL1",
+ "name": "CJALSDAC-JNL1"
+ },
+ {
+ "id": "OLK1",
+ "name": "OLKOLKLS-OLK1"
+ },
+ {
+ "id": "CHI1",
+ "name": "CHILLIWE-CHI1"
+ },
+ {
+ "id": "UUU4",
+ "name": "UUUAAAUU-UUU4"
+ },
+ {
+ "id": "TUF1",
+ "name": "TUFCLLI1-TUF1"
+ },
+ {
+ "id": "KJN1",
+ "name": "CKALDKSA-KJN1"
+ },
+ {
+ "id": "SAM1",
+ "name": "SNDGCA64-SAN1"
+ },
+ {
+ "id": "SCK1",
+ "name": "SCKSCKSK-SCK1"
+ },
+ {
+ "id": "HJH1",
+ "name": "AOEEQQQD-HJH1"
+ },
+ {
+ "id": "HGD1",
+ "name": "SDFQWHGD-HGD1"
+ },
+ {
+ "id": "KOR1",
+ "name": "HYFLNBVT-KOR1"
+ },
+ {
+ "id": "ATL43",
+ "name": "AICLOCID-ATL43"
+ },
+ {
+ "id": "ATL54",
+ "name": "AICFTAAI-ATL54"
+ },
+ {
+ "id": "ATL66",
+ "name": "CLLIAAII-ATL66"
+ },
+ {
+ "id": "VEL1",
+ "name": "BNMLKUIK-VEL1"
+ },
+ {
+ "id": "ICC1",
+ "name": "SANJITAT-ICC1"
+ },
+ {
+ "id": "MNT11",
+ "name": "WSXEFBTH-MNT11"
+ },
+ {
+ "id": "DEF2",
+ "name": "WSBHGTYL-DEF2"
+ },
+ {
+ "id": "MAD11",
+ "name": "SDFQWGKL-MAD11"
+ },
+ {
+ "id": "OLG1",
+ "name": "OLHOLHOL-OLG1"
+ },
+ {
+ "id": "GAR1",
+ "name": "NGFVSJKO-GAR1"
+ },
+ {
+ "id": "SAN22",
+ "name": "GNVLSCTL-SAN22"
+ },
+ {
+ "id": "HRG1",
+ "name": "HRGHRGGS-HRG1"
+ },
+ {
+ "id": "JCS1",
+ "name": "JCSJSCJS-JCS1"
+ },
+ {
+ "id": "DHA12",
+ "name": "WSXEDECF-DHA12"
+ },
+ {
+ "id": "HJE1",
+ "name": "AOEEWWWD-HJE1"
+ },
+ {
+ "id": "NCA1",
+ "name": "NCANCANN-NCA1"
+ },
+ {
+ "id": "IOP1",
+ "name": "iopclli1-IOP1"
+ },
+ {
+ "id": "RTY1",
+ "name": "rtyclli1-RTY1"
+ },
+ {
+ "id": "KAP1",
+ "name": "HIOUYTRQ-KAP1"
+ },
+ {
+ "id": "ZEN1",
+ "name": "ZENCLLI1-ZEN1"
+ },
+ {
+ "id": "HKA1",
+ "name": "JAKHLASS-HKA1"
+ },
+ {
+ "id": "CQK1",
+ "name": "CQKSCAKK-CQK1"
+ },
+ {
+ "id": "SAI1",
+ "name": "UBEKQLPD-SAI1"
+ },
+ {
+ "id": "ERT1",
+ "name": "ertclli1-ERT1"
+ },
+ {
+ "id": "IBB1",
+ "name": "PLMKOIJU-IBB1"
+ },
+ {
+ "id": "TIR2",
+ "name": "PLKINHYI-TIR2"
+ },
+ {
+ "id": "HSD1",
+ "name": "CHASKCDS-HSD1"
+ },
+ {
+ "id": "SLF78",
+ "name": "SDCTLFN1-SLF78"
+ },
+ {
+ "id": "SEE78",
+ "name": "SDCTEEE4-SEE78"
+ },
+ {
+ "id": "SAN13",
+ "name": "TOKYJPFA-SAN13"
+ },
+ {
+ "id": "SAA78",
+ "name": "SDCTAAA1-SAA78"
+ },
+ {
+ "id": "LUC1",
+ "name": "ATLDFGYC-LUC1"
+ },
+ {
+ "id": "AMD13",
+ "name": "MEMATLAN-AMD13"
+ },
+ {
+ "id": "TOR1",
+ "name": "TOROONXN-TOR1"
+ },
+ {
+ "id": "QWE1",
+ "name": "QWECLLI1-QWE1"
+ },
+ {
+ "id": "ZOG1",
+ "name": "ZOGASTRO-ZOG1"
+ },
+ {
+ "id": "CAL33",
+ "name": "CALIFORN-CAL33"
+ },
+ {
+ "id": "SHH78",
+ "name": "SDIT1HHH-SHH78"
+ },
+ {
+ "id": "DSA1",
+ "name": "LKJHGFDS-DSA1"
+ },
+ {
+ "id": "CLG1",
+ "name": "CLGRABAD-CLG1"
+ },
+ {
+ "id": "BNA1",
+ "name": "BNARAGBK-BNA1"
+ },
+ {
+ "id": "ATL84",
+ "name": "CANTTCOC-ATL84"
+ },
+ {
+ "id": "APP1",
+ "name": "WBHGTYUI-APP1"
+ },
+ {
+ "id": "RJN1",
+ "name": "RJNRBZAW-RJN1"
+ },
+ {
+ "id": "EHH78",
+ "name": "SDCSHHH5-EHH78"
+ },
+ {
+ "id": "mac10",
+ "name": "PKGTESTF-mac10"
+ },
+ {
+ "id": "SXB78",
+ "name": "SDCTGXB1-SXB78"
+ },
+ {
+ "id": "SAX78",
+ "name": "SDCTAXG1-SAX78"
+ },
+ {
+ "id": "SYD1",
+ "name": "SYDNAUBV-SYD1"
+ },
+ {
+ "id": "TOK1",
+ "name": "TOKYJPFA-TOK1"
+ },
+ {
+ "id": "KGM2",
+ "name": "KGMTNC20-KGM2"
+ },
+ {
+ "id": "DCC1b",
+ "name": "POIUYTGH-DCC1b"
+ },
+ {
+ "id": "SKK78",
+ "name": "SDCTKKK1-SKK78"
+ },
+ {
+ "id": "SGG78",
+ "name": "SDCTGGG1-SGG78"
+ },
+ {
+ "id": "SJJ78",
+ "name": "SDCTJJJ1-SJJ78"
+ },
+ {
+ "id": "SBX78",
+ "name": "SDCTBXG1-SBX78"
+ },
+ {
+ "id": "LAG1",
+ "name": "LARGIZON-LAG1"
+ },
+ {
+ "id": "IAA1",
+ "name": "QAZXSWED-IAA1"
+ },
+ {
+ "id": "POI1",
+ "name": "PLMNJKIU-POI1"
+ },
+ {
+ "id": "LAG1a",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "PBL1",
+ "name": "PBLAPBAI-PBL1"
+ },
+ {
+ "id": "LAG45",
+ "name": "LARGIZON-LAG1a"
+ },
+ {
+ "id": "MAR1",
+ "name": "MNBVCXZM-MAR1"
+ },
+ {
+ "id": "HST70",
+ "name": "HSTNTX70-HST70"
+ },
+ {
+ "id": "DCC1a",
+ "name": "POIUYTGH-DCC1a"
+ },
+ {
+ "id": "TOL1",
+ "name": "TOLDOH21-TOL1"
+ },
+ {
+ "id": "LON1",
+ "name": "LONEENCO-LON1"
+ },
+ {
+ "id": "SJU78",
+ "name": "SDIT1JUB-SJU78"
+ },
+ {
+ "id": "STN27",
+ "name": "HSTNTX01-STN27"
+ },
+ {
+ "id": "SSW56",
+ "name": "ss8126GT-SSW56"
+ },
+ {
+ "id": "SBB78",
+ "name": "SDIT1BBB-SBB78"
+ },
+ {
+ "id": "DCC3",
+ "name": "POIUYTGH-DCC3"
+ },
+ {
+ "id": "GNV1",
+ "name": "GNVLSCTL-GNV1"
+ },
+ {
+ "id": "WAS1",
+ "name": "WASHDCSW-WAS1"
+ },
+ {
+ "id": "TOY1",
+ "name": "TORYONNZ-TOY1"
+ },
+ {
+ "id": "STT1",
+ "name": "STTLWA02-STT1"
+ },
+ {
+ "id": "STG1",
+ "name": "STTGGE62-STG1"
+ },
+ {
+ "id": "SLL78",
+ "name": "SDCTLLL1-SLL78"
+ },
+ {
+ "id": "SBU78",
+ "name": "SDIT1BUB-SBU78"
+ },
+ {
+ "id": "ATL2",
+ "name": "ATLNGANW-ATL2"
+ },
+ {
+ "id": "BOT1",
+ "name": "BOTHWAKY-BOT1"
+ },
+ {
+ "id": "SNG1",
+ "name": "SNGPSIAU-SNG1"
+ },
+ {
+ "id": "NYC1",
+ "name": "NYCMNY54-NYC1"
+ },
+ {
+ "id": "LAG1b",
+ "name": "LARGIZON-LAG1b"
+ },
+ {
+ "id": "AMD15",
+ "name": "AMDFAA01-AMD15"
+ },
+ {
+ "id": "SNA1",
+ "name": "SNANTXCA-SNA1"
+ },
+ {
+ "id": "PLT1",
+ "name": "PLTNCA60-PLT1"
+ },
+ {
+ "id": "TLP1",
+ "name": "TLPNXM18-TLP1"
+ },
+ {
+ "id": "SDD81",
+ "name": "SAIT1DD6-SDD81"
+ },
+ {
+ "id": "DCC1",
+ "name": "POIUYTGH-DCC1"
+ },
+ {
+ "id": "DCC2",
+ "name": "POIUYTGH-DCC2"
+ },
+ {
+ "id": "OKC1",
+ "name": "OKCBOK55-OKC1"
+ },
+ {
+ "id": "PAR1",
+ "name": "PARSFRCG-PAR1"
+ },
+ {
+ "id": "TES36",
+ "name": "ABCEETES-TES36"
+ },
+ {
+ "id": "COM1",
+ "name": "PLMKOPIU-COM1"
+ },
+ {
+ "id": "ANI1",
+ "name": "ATLNGTRE-ANI1"
+ },
+ {
+ "id": "SDG78",
+ "name": "SDIT1BDG-SDG78"
+ },
+ {
+ "id": "mac20",
+ "name": "PKGTESTF-mac20"
+ },
+ {
+ "id": "DSF45",
+ "name": "DSFBG123-DSF45"
+ },
+ {
+ "id": "HST25",
+ "name": "HSTNTX01-HST25"
+ },
+ {
+ "id": "AMD18",
+ "name": "AUDIMA01-AMD18"
+ },
+ {
+ "id": "SAA80",
+ "name": "SAIT9AA3-SAA80"
+ },
+ {
+ "id": "SSA56",
+ "name": "SSIT2AA7-SSA56"
+ },
+ {
+ "id": "SDD82",
+ "name": "SAIT1DD9-SDD82"
+ },
+ {
+ "id": "JCV1",
+ "name": "JCVLFLBW-JCV1"
+ },
+ {
+ "id": "SUL2",
+ "name": "WERTYUJK-SUL2"
+ },
+ {
+ "id": "PUR1",
+ "name": "purelyde-PUR1"
+ },
+ {
+ "id": "FDE55",
+ "name": "FDERT555-FDE55"
+ },
+ {
+ "id": "SITE",
+ "name": "LONEENCO-SITE"
+ },
+ {
+ "id": "ATL1",
+ "name": "ATLNGAMA-ATL1"
+ },
+ {
+ "id": "JUL1",
+ "name": "ZXCVBNMM-JUL1"
+ },
+ {
+ "id": "TAT34",
+ "name": "TESAAISB-TAT34"
+ },
+ {
+ "id": "XCP12",
+ "name": "CHKGH123-XCP12"
+ },
+ {
+ "id": "RAI1",
+ "name": "poiuytre-RAI1"
+ },
+ {
+ "id": "HPO1",
+ "name": "ATLNGAUP-HPO1"
+ },
+ {
+ "id": "KJF12",
+ "name": "KJFDH123-KJF12"
+ },
+ {
+ "id": "SCC80",
+ "name": "SAIT9CC3-SCC80"
+ },
+ {
+ "id": "SAA12",
+ "name": "SAIT9AF8-SAA12"
+ },
+ {
+ "id": "SAA14",
+ "name": "SAIT1AA9-SAA14"
+ },
+ {
+ "id": "ATL35",
+ "name": "TTESSAAI-ATL35"
+ },
+ {
+ "id": "CWY1",
+ "name": "CWYMOWBS-CWY1"
+ },
+ {
+ "id": "ATL76",
+ "name": "TELEPAAI-ATL76"
+ },
+ {
+ "id": "DSL12",
+ "name": "DSLFK242-DSL12"
+ },
+ {
+ "id": "ATL53",
+ "name": "AAIATLTE-ATL53"
+ },
+ {
+ "id": "SAA11",
+ "name": "SAIT9AA2-SAA11"
+ },
+ {
+ "id": "ATL62",
+ "name": "TESSASCH-ATL62"
+ },
+ {
+ "id": "AUG1",
+ "name": "ASDFGHJK-AUG1"
+ },
+ {
+ "id": "POI22",
+ "name": "POIUY123-POI22"
+ },
+ {
+ "id": "SAA13",
+ "name": "SAIT1AA9-SAA13"
+ },
+ {
+ "id": "BHY17",
+ "name": "BHYTFRF3-BHY17"
+ },
+ {
+ "id": "LIS1",
+ "name": "HOSTPROF-LIS1"
+ },
+ {
+ "id": "SIP1",
+ "name": "ZXCVBNMK-SIP1"
+ },
+ {
+ "id": "ATL99",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "ATL64",
+ "name": "FORLOAAJ-ATL64"
+ },
+ {
+ "id": "TAT33",
+ "name": "TESAAISA-TAT33"
+ },
+ {
+ "id": "RAD10",
+ "name": "INDIPUNE-RAD10"
+ },
+ {
+ "id": "RTW5",
+ "name": "BHYTFRY4-RTW5"
+ },
+ {
+ "id": "JGS1",
+ "name": "KSJKKKKK-JGS1"
+ },
+ {
+ "id": "ATL98",
+ "name": "TEESTAAI-ATL43"
+ },
+ {
+ "id": "WAN1",
+ "name": "LEIWANGW-WAN1"
+ },
+ {
+ "id": "ATL44",
+ "name": "ATLSANAB-ATL44"
+ },
+ {
+ "id": "RTD2",
+ "name": "BHYTFRk4-RTD2"
+ },
+ {
+ "id": "NIR1",
+ "name": "ORFLMANA-NIR1"
+ },
+ {
+ "id": "ATL75",
+ "name": "SANAAIRE-ATL75"
+ },
+ {
+ "id": "NUM1",
+ "name": "QWERTYUI-NUM1"
+ },
+ {
+ "id": "hvf32",
+ "name": "MDTWNJ21-hvf32"
+ },
+ {
+ "id": "RTZ4",
+ "name": "BHYTFRZ6-RTZ4"
+ },
+ {
+ "id": "ATL56",
+ "name": "ATLSANAC-ATL56"
+ },
+ {
+ "id": "AMS1",
+ "name": "AMSTNLBW-AMS1"
+ },
+ {
+ "id": "RCT1",
+ "name": "AMSTERNL-RCT1"
+ },
+ {
+ "id": "JAN1",
+ "name": "ORFLMATT-JAN1"
+ },
+ {
+ "id": "ABC14",
+ "name": "TESAAISA-ABC14"
+ },
+ {
+ "id": "TAT37",
+ "name": "TESAAISD-TAT37"
+ },
+ {
+ "id": "MIC54",
+ "name": "MICHIGAN-MIC54"
+ },
+ {
+ "id": "ABC11",
+ "name": "ATLSANAI-ABC11"
+ },
+ {
+ "id": "AMF11",
+ "name": "AMDOCS01-AMF11"
+ },
+ {
+ "id": "ATL63",
+ "name": "ATLSANEW-ATL63"
+ },
+ {
+ "id": "ABC12",
+ "name": "ATLSECIA-ABC12"
+ },
+ {
+ "id": "hvf20",
+ "name": "MDTWNJ21-hvf20"
+ },
+ {
+ "id": "ABC15",
+ "name": "AAITESAN-ABC15"
+ },
+ {
"id": "AVT1",
"name": "AVTRFLHD-AVT1"
},
@@ -948,8 +1821,8 @@ describe('VNF Control Generator', () => {
test('getMacroFormControls check for mandatory controls', () => {
const serviceId : string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfName : string = "VF_vMee 0";
- const vnfStoreKey : string = "VF_vMee 0";
+ const vnfName : string = "VF_vGeraldine 0";
+ const vnfStoreKey : string = "VF_vGeraldine 0";
const controls :FormControlModel[] = service.getMacroFormControls(serviceId, vnfStoreKey, vnfName, []);
const mandatoryControls : string[] = [
@@ -984,14 +1857,14 @@ describe('VNF Control Generator', () => {
function getALaCarteFormControls(vnfStoreKey: string): FormControlModel[] {
const serviceId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfName: string = "VF_vMee 0";
+ const vnfName: string = "VF_vGeraldine 0";
const controls: FormControlModel[] = service.getAlaCarteFormControls(serviceId, vnfStoreKey, vnfName, []);
return controls;
}
test('getMacroFormControls should return the correct order of controls', () => {
const serviceId : string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
- const vnfName : string = "VF_vMee 0";
+ const vnfName : string = "VF_vGeraldine 0";
const vnfStoreKey : string = null;
const controls :FormControlModel[] = service.getMacroFormControls(serviceId, vnfStoreKey, vnfName, []);
@@ -1030,12 +1903,13 @@ describe('VNF Control Generator', () => {
test('getAlacartFormControls check for mandatory controls', () => {
- const controls = getALaCarteFormControls("VF_vMee 0");
+ const controls = getALaCarteFormControls("VF_vGeraldine 0");
const mandatoryControls : string[] = [
FormControlNames.INSTANCE_NAME,
FormControlNames.LCPCLOUD_REGION_ID,
'tenantId',
'platformName',
+ 'lineOfBusiness',
'rollbackOnFailure'
];
for(let i = 0 ; i < mandatoryControls.length ; i++){
@@ -1045,7 +1919,7 @@ describe('VNF Control Generator', () => {
});
test('getAlacartFormControls instance name control validator shall have the expected regex', () => {
- const controls:FormControlModel[] = getALaCarteFormControls("VF_vMee 0");
+ const controls:FormControlModel[] = getALaCarteFormControls("VF_vGeraldine 0");
const instanceNameControl: FormControlModel = <FormControlModel>controls.find(item => item.controlName === FormControlNames.INSTANCE_NAME);
const instanceNameValidator: ValidatorModel = instanceNameControl.validations.find(val => val.validatorName === ValidatorOptions.pattern);
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.ts
index 3484038b1..7760ba8ad 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.ts
@@ -133,7 +133,7 @@ export class VnfControlGenerator {
isDisabled: false,
name: "lineOfBusiness",
value: instance ? instance.lineOfBusiness : null,
- validations: [],
+ validations: [new ValidatorModel(ValidatorOptions.required, 'is required')],
onInitSelectedField: ['lineOfBusinessList'],
onInit: this._basicControlGenerator.getSubscribeInitResult.bind(null, this._aaiService.getCategoryParameters)
})
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
index 6dcaa8235..71d661191 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
@@ -28,15 +28,10 @@ class MockAppStore<T> {
"CREATE_INSTANCE_TEST": false,
"EMPTY_DRAWING_BOARD_TEST": false,
"FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
- "FLAG_ASYNC_INSTANTIATION": true,
- "FLAG_ASYNC_JOBS": true,
"FLAG_ADD_MSO_TESTAPI_FIELD": true,
- "FLAG_UNASSIGN_SERVICE": false,
"FLAG_SERVICE_MODEL_CACHE": false,
- "FLAG_COLLECTION_RESOURCE_SUPPORT": true,
"FLAG_SHOW_ASSIGNMENTS": true,
"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
- "FLAG_DUPLICATE_VNF": true,
"FLAG_DEFAULT_VNF": true,
"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
"FLAG_A_LA_CARTE_AUDIT_INFO": true,
@@ -70,15 +65,15 @@ class MockAppStore<T> {
},
"vnfs": {},
"networks": {},
- "collectionResource": {},
+ "collectionResources": {},
"configurations": {},
"fabricConfigurations": {},
"serviceProxies": {
- "vdbe_svc_vprs_proxy 0": {
+ "vdorothea_svc_vprs_proxy 0": {
"uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
"invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
- "description": "A Proxy for Service vDBE_Svc_vPRS",
- "name": "vDBE_Svc_vPRS Service Proxy",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
"version": "1.0",
"customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
"inputs": {},
@@ -87,7 +82,7 @@ class MockAppStore<T> {
"type": "Service Proxy",
"sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
"sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
- "sourceModelName": "vDBE_Svc_vPRS"
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
},
"tsbc0001vm001_svc_proxy 0": {
"uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
@@ -125,11 +120,11 @@ class MockAppStore<T> {
"type": "LOAD-GROUP"
},
"members": {
- "vdbe_svc_vprs_proxy 0": {
+ "vdorothea_svc_vprs_proxy 0": {
"uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
"invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
- "description": "A Proxy for Service vDBE_Svc_vPRS",
- "name": "vDBE_Svc_vPRS Service Proxy",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
"version": "1.0",
"customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
"inputs": {},
@@ -138,7 +133,7 @@ class MockAppStore<T> {
"type": "Service Proxy",
"sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
"sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
- "sourceModelName": "vDBE_Svc_vPRS"
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
}
}
},