diff options
| author |   Eddy Hautot <eh552t@intl.att.com> | 2018-04-24 16:10:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-24 16:10:08 +0000 |
| commit | e265dec047435408d2349e9f101349bcfbd3ef6c (patch) | |
| tree | cd6bb62f208fe49d2bf4ee6e71f88870287a75cc /src/test/resources/clds/templates | |
| parent | eb3342f16c870cedb37b27d01d37bd2d83530c25 (diff) | |
| parent | bf74fbfd181970d880803e4f8bc4f34a7a498f6e (diff) | |
Merge changes I09044986,Ib63b98f1,Ib974f943
* changes:
Remove eNodeB
Remove enodeB code
Remove bad test
Diffstat (limited to 'src/test/resources/clds/templates')
| -rw-r--r-- | src/test/resources/clds/templates/globalProperties.json | 7 | ||||
| -rw-r--r-- | src/test/resources/clds/templates/op-eNodeB-recipe.json | 44 |
2 files changed, 1 insertions, 50 deletions
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": "" - } - ] -} |