From bf74fbfd181970d880803e4f8bc4f34a7a498f6e Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 24 Apr 2018 17:20:31 +0200 Subject: Remove eNodeB Remove eNodeB in the config files for UI and tests Issue-ID: CLAMP-153 Change-Id: I090449869e83220777387d58b37ebcd3d7dec101 Signed-off-by: Determe, Sebastien (sd378r) --- .../expected-result/sdc-properties-4cc5b45a.json | 7 +----- .../example/sdc/sdcResourceDetailsExample.json | 11 --------- src/test/resources/example/sdc/sdcVFResources.json | 28 +--------------------- 3 files changed, 2 insertions(+), 44 deletions(-) (limited to 'src/test/resources/example/sdc') diff --git a/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json b/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json index 8c5f39d8d..5e0ba72ab 100644 --- a/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json +++ b/src/test/resources/example/sdc/expected-result/sdc-properties-4cc5b45a.json @@ -36,8 +36,7 @@ }, "global": { "actionSet": { - "vnfRecipe": "VNF", - "enbRecipe": "eNodeB" + "vnfRecipe": "VNF" }, "location": { "DC1": "Data Center 1", @@ -55,10 +54,6 @@ "migrate": "Migrate", "healthCheck": "Health Check" }, - "enbRecipe": { - "": "", - "reset": "Reset" - }, "maxRetries": "3", "retryTimeLimit": 180, "resource": { diff --git a/src/test/resources/example/sdc/sdcResourceDetailsExample.json b/src/test/resources/example/sdc/sdcResourceDetailsExample.json index 6087d020f..3e904b107 100644 --- a/src/test/resources/example/sdc/sdcResourceDetailsExample.json +++ b/src/test/resources/example/sdc/sdcResourceDetailsExample.json @@ -108,17 +108,6 @@ "artifactVersion": "1", "artifactLabel": "heatartifact2", "artifactGroupType": "DEPLOYMENT" - }, - { - "artifactName": "eNodeB_Thresholds.csv", - "artifactType": "OTHER", - "artifactURL": "/sdc/v1/catalog/resources/84855843-5247-4e97-a2bd-5395a510253b/artifacts/d57ac7ec-f3c3-4793-983a-c75ac3a43153", - "artifactDescription": "kpis with nfNamingCode", - "artifactChecksum": "YTc1MDU0ZDFhODUwMGM5YmIwM2FmMWUzMmRiY2NlMGI=", - "artifactUUID": "d57ac7ec-f3c3-4793-983a-c75ac3a43153", - "artifactVersion": "1", - "artifactLabel": "kpis", - "artifactGroupType": "DEPLOYMENT" } ], diff --git a/src/test/resources/example/sdc/sdcVFResources.json b/src/test/resources/example/sdc/sdcVFResources.json index 62c58bee6..7bf99bb45 100644 --- a/src/test/resources/example/sdc/sdcVFResources.json +++ b/src/test/resources/example/sdc/sdcVFResources.json @@ -622,20 +622,7 @@ "lifecycleState": "READY_FOR_CERTIFICATION", "lastUpdaterUserId": "rx827p" }, - - { - "uuid": "e01dfc8f-2529-423b-9765-08b57df6ba51", - "invariantUUID": "6c7aaec2-59eb-41d9-8681-b7f976ab668d", - "name": "eNodeB-vf", - "version": "1.1", - "toscaModelURL": "/sdc/v1/catalog/resources/e01dfc8f-2529-423b-9765-08b57df6ba51/toscaModel", - "category": "Application L4+", - "subCategory": "Application Server", - "resourceType": "VF", - "lifecycleState": "CERTIFICATION_IN_PROGRESS", - "lastUpdaterUserId": "rx827p" - }, - + { "uuid": "d26e8473-b1c9-4751-bf7c-be0e10ba71ac", "invariantUUID": "e06a2a94-5ff9-4ab7-879f-c2d5cfaef1ca", @@ -1481,19 +1468,6 @@ "lastUpdaterUserId": "sa997j" }, - { - "uuid": "e01dfc8f-2529-423b-9765-08b57df6ba51", - "invariantUUID": "6c7aaec2-59eb-41d9-8681-b7f976ab668d", - "name": "eNodeB-vf", - "version": "2.0", - "toscaModelURL": "/sdc/v1/catalog/resources/e01dfc8f-2529-423b-9765-08b57df6ba51/toscaModel", - "category": "Application L4+", - "subCategory": "Application Server", - "resourceType": "VF", - "lifecycleState": "CERTIFIED", - "lastUpdaterUserId": "af3193" - }, - { "uuid": "1cad2e90-0259-498f-884d-7bbe5a156fb2", "invariantUUID": "76b01019-a533-4c31-871d-6275924c7543", -- cgit 1.2.3-korg