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) <sd378r@intl.att.com>

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
index a0b8f4e..c905be3 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html
@@ -837,15 +837,6 @@ label {
                                            });
                                                }
                                                break;
-                                       } else if (asSel == "enbRecipe"){
-                                               if (vf_Services["policy"][asSel]){
-                                                       $.each((vf_Services["policy"][asSel]), function(val, text) {
-                                               $('#recipe').append(
-                                                   $('<option></option>').val(val).html(text)
-                                               );
-                                           });
-                                               }
-                                               break;
                                        }
                                };
                        };

diff --git a/src/main/resources/clds/templates/globalProperties.json b/src/main/resources/clds/templates/globalProperties.json
index 9ac9d94..c9bbbf7 100644 (file)
--- a/src/main/resources/clds/templates/globalProperties.json
+++ b/src/main/resources/clds/templates/globalProperties.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/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json
index 9ac9d94..c9bbbf7 100644 (file)
--- a/src/test/resources/clds/templates/globalProperties.json
+++ b/src/test/resources/clds/templates/globalProperties.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/clds/templates/op-eNodeB-recipe.json b/src/test/resources/clds/templates/op-eNodeB-recipe.json
deleted file mode 100644 (file)
index 7098987..0000000
--- a/src/test/resources/clds/templates/op-eNodeB-recipe.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-       "eNodeBRecipes": [
-               {
-                       "Actor": "AOTS",
-                       "Recipe": "checkENodeBTicketHours",
-                       "ParentPolicy": "",
-                       "PPConditions": "",
-                       "Retry": "0",
-                       "TimeLimit": "120"
-               },
-               {
-                       "Actor": "AOTS",
-                       "Recipe": "checkEquipmentStatus",
-                       "ParentPolicy": "checkENodeBTicketHours",
-                       "PPConditions": "Success",
-                       "Retry": "0",
-                       "TimeLimit": "120"
-               },
-               {
-                       "Actor": "AOTS",
-                       "Recipe": "checkEimStatus",
-                       "ParentPolicy": "checkEquipmentStatus",
-                       "PPConditions": "Success",
-                       "Retry": "0",
-                       "TimeLimit": "120"
-               },
-               {
-                       "Actor": "AOTS",
-                       "Recipe": "checkMaintenanceWindow",
-                       "ParentPolicy": "checkEimStatus",
-                       "PPConditions": "Success",
-                       "Retry": "0",
-                       "TimeLimit": "120"
-               },
-               {
-                       "Actor": "SDNR",
-                       "Recipe": "Reset",
-                       "ParentPolicy": "checkMaintenanceWindow",
-                       "PPConditions": "Success",
-                       "Retry": "",
-                       "TimeLimit": ""
-               }
-       ]
-}

diff --git a/src/test/resources/example/model-properties/custom/modelBpmnProperties.json b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
index fc2f1fd..740edee 100644 (file)
--- a/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
@@ -21,7 +21,7 @@
             "name": "actionSet",
             "value":
             [
-                "enbRecipe"
+                "vnfRecipe"
             ]
         },
 

diff --git a/src/test/resources/example/model-properties/policy/modelBpmnProperties.json b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
index 99f67b6..5c2214e 100644 (file)
--- a/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
@@ -21,7 +21,7 @@
             "name": "actionSet",
             "value":
             [
-                "enbRecipe"
+                "vnfRecipe"
             ]
         },
 

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 8c5f39d..5e0ba72 100644 (file)
--- 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 6087d02..3e904b1 100644 (file)
--- 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 62c58be..7bf99bb 100644 (file)
--- 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",