Merge changes I09044986,Ib63b98f1,Ib974f943

* changes:
  Remove eNodeB 
  Remove enodeB code
  Remove bad test

11 files changed, 52 insertions, 264 deletions

diff --git a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
index 43f212cf3..a91da8a07 100644
--- a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
@@ -74,20 +74,24 @@ public class OperationPolicyReqItCase {
         // now validate the Yaml, to do so we replace the dynamic ID by a known
         // key so that we can compare it
         String yaml = URLDecoder.decode(attributes.get(0).get(AttributeType.RULE).get("ControlLoopYaml"), "UTF-8");
-        yaml = yaml.replaceAll("trigger_policy: (.*)", "trigger_policy: <generatedId>");
-        yaml = yaml.replaceAll("id: (.*)", "id: <generatedId>");
-        yaml = yaml.replaceAll("success: (.*)", "success: <generatedId>");
-        // Remove this field as not always present (depends of policy api)
-        yaml = yaml.replaceAll("  pnf: null" + System.lineSeparator(), "");
-        yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
+        yaml = replaceGeneratedValues(yaml);
         assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-1.yaml"), yaml);
         yaml = URLDecoder.decode(attributes.get(1).get(AttributeType.RULE).get("ControlLoopYaml"), "UTF-8");
+        yaml = replaceGeneratedValues(yaml);
+        assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-2.yaml"), yaml);
+    }
+
+    private String replaceGeneratedValues(String yaml) {
         yaml = yaml.replaceAll("trigger_policy: (.*)", "trigger_policy: <generatedId>");
         yaml = yaml.replaceAll("id: (.*)", "id: <generatedId>");
         yaml = yaml.replaceAll("success: (.*)", "success: <generatedId>");
         // Remove this field as not always present (depends of policy api)
         yaml = yaml.replaceAll("  pnf: null" + System.lineSeparator(), "");
+        yaml = yaml.replaceAll("failure: (.*)", "failure: <generatedId>");
+        yaml = yaml.replaceAll("failure_exception: (.*)", "failure_exception: <generatedId>");
+        yaml = yaml.replaceAll("failure_retries: (.*)", "failure_retries: <generatedId>");
+        yaml = yaml.replaceAll("failure_timeout: (.*)", "failure_timeout: <generatedId>");
         yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
-        assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-2.yaml"), yaml);
+        return yaml;
     }
 }
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index e0775ec67..535f54af0 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -166,17 +166,6 @@ clamp.config.op.operationTopic=APPC-CL
 clamp.config.op.notificationTopic=POLICY-CL-MGT

 clamp.config.op.controller=amsterdam

 clamp.config.op.policy.appc=APPC

-# by service: vSCP

-clamp.config.op.templateName.vSCP=ClosedLoopTemplate

-clamp.config.op.controller.vSCP=1607-f5fw

-clamp.config.op.eNodeB.templateName=ClosedLoopControlName

-clamp.config.op.eNodeB.operationTopic=com.onap.sdnr.RanCLRequest-v00

-clamp.config.op.eNodeB.notificationTopic=com.onap-policy.IST-ENODEB-CL

-clamp.config.op.eNodeB.controller=amsterdam

-clamp.config.op.eNodeB.recipe=classpath:/clds/templates/op-eNodeB-recipe.json

-clamp.config.op.eNodeB.timeWindow=35

-clamp.config.op.eNodeB.limit=2

-clamp.config.op.eNodeB.period=10s

 #

 # Sdc service properties

 clamp.config.sdc.catalog.url=http://localhost:${docker.http-cache.port.host}/sdc/v1/catalog/

diff --git a/src/test/resources/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json
index 9ac9d9443..c9bbbf72b 100644
--- 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
index 7098987a2..000000000
--- 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 fc2f1fd99..740edeeab 100644
--- 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 99f67b62e..5c2214e84 100644
--- 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/operational-policy/yaml-policy-chain-1.yaml b/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
index afe9fdd8e..fec0e1e6c 100644
--- a/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
+++ b/src/test/resources/example/operational-policy/yaml-policy-chain-1.yaml
@@ -16,93 +16,36 @@ controlLoop:
   trigger_policy: <generatedId>
   version: 2.0.0
 policies:
-- actor: AOTS
-  description: checkENodeBTicketHours Policy - the trigger (no parent) policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
+- actor: APPC
+  description: restart Policy - the trigger (no parent) policy - created by CLDS
+  failure: <generatedId>
+  failure_exception: <generatedId>
   failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
+  failure_retries: <generatedId>
+  failure_timeout: <generatedId>
   id: <generatedId>
-  name: checkENodeBTicketHours Policy
-  operationsAccumulateParams: null
-  payload:
-    timeWindow: '35'
-  recipe: checkENodeBTicketHours
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkEquipmentStatus Policy - triggered conditionally by checkENodeBTicketHours Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: checkEquipmentStatus Policy
-  operationsAccumulateParams: null
-  payload: null
-  recipe: checkEquipmentStatus
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkEimStatus Policy - triggered conditionally by checkEquipmentStatus Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: checkEimStatus Policy
+  name: restart Policy
   operationsAccumulateParams: null
   payload: null
-  recipe: checkEimStatus
-  retry: 0
+  recipe: restart
+  retry: 3
   success: <generatedId>
   target:
     resourceID: resource-id
     type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkMaintenanceWindow Policy - triggered conditionally by checkEimStatus Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
+  timeout: 180
+- actor: APPC
+  description: rebuild Policy - triggered conditionally by restart Policy - created by CLDS
+  failure: <generatedId>
+  failure_exception: <generatedId>
   failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
+  failure_retries: <generatedId>
+  failure_timeout: <generatedId>
   id: <generatedId>
-  name: checkMaintenanceWindow Policy
+  name: rebuild Policy
   operationsAccumulateParams: null
   payload: null
-  recipe: checkMaintenanceWindow
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: SDNR
-  description: Reset Policy - triggered conditionally by checkMaintenanceWindow Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: Reset Policy
-  operationsAccumulateParams:
-    limit: 2
-    period: 10s
-  payload: null
-  recipe: Reset
+  recipe: rebuild
   retry: 3
   success: <generatedId>
   target:
diff --git a/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml b/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
index afe9fdd8e..fec0e1e6c 100644
--- a/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
+++ b/src/test/resources/example/operational-policy/yaml-policy-chain-2.yaml
@@ -16,93 +16,36 @@ controlLoop:
   trigger_policy: <generatedId>
   version: 2.0.0
 policies:
-- actor: AOTS
-  description: checkENodeBTicketHours Policy - the trigger (no parent) policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
+- actor: APPC
+  description: restart Policy - the trigger (no parent) policy - created by CLDS
+  failure: <generatedId>
+  failure_exception: <generatedId>
   failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
+  failure_retries: <generatedId>
+  failure_timeout: <generatedId>
   id: <generatedId>
-  name: checkENodeBTicketHours Policy
-  operationsAccumulateParams: null
-  payload:
-    timeWindow: '35'
-  recipe: checkENodeBTicketHours
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkEquipmentStatus Policy - triggered conditionally by checkENodeBTicketHours Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: checkEquipmentStatus Policy
-  operationsAccumulateParams: null
-  payload: null
-  recipe: checkEquipmentStatus
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkEimStatus Policy - triggered conditionally by checkEquipmentStatus Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: checkEimStatus Policy
+  name: restart Policy
   operationsAccumulateParams: null
   payload: null
-  recipe: checkEimStatus
-  retry: 0
+  recipe: restart
+  retry: 3
   success: <generatedId>
   target:
     resourceID: resource-id
     type: VM
-  timeout: 120
-- actor: AOTS
-  description: checkMaintenanceWindow Policy - triggered conditionally by checkEimStatus Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
+  timeout: 180
+- actor: APPC
+  description: rebuild Policy - triggered conditionally by restart Policy - created by CLDS
+  failure: <generatedId>
+  failure_exception: <generatedId>
   failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
+  failure_retries: <generatedId>
+  failure_timeout: <generatedId>
   id: <generatedId>
-  name: checkMaintenanceWindow Policy
+  name: rebuild Policy
   operationsAccumulateParams: null
   payload: null
-  recipe: checkMaintenanceWindow
-  retry: 0
-  success: <generatedId>
-  target:
-    resourceID: resource-id
-    type: VM
-  timeout: 120
-- actor: SDNR
-  description: Reset Policy - triggered conditionally by checkMaintenanceWindow Policy - created by CLDS
-  failure: FINAL_FAILURE
-  failure_exception: FINAL_FAILURE_EXCEPTION
-  failure_guard: FINAL_FAILURE_GUARD
-  failure_retries: FINAL_FAILURE_RETRIES
-  failure_timeout: FINAL_FAILURE_TIMEOUT
-  id: <generatedId>
-  name: Reset Policy
-  operationsAccumulateParams:
-    limit: 2
-    period: 10s
-  payload: null
-  recipe: Reset
+  recipe: rebuild
   retry: 3
   success: <generatedId>
   target:
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",
@@ -1482,19 +1469,6 @@
     },
 
     {
-        "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",
         "name": "vPE-AV-renana",