diff options
author | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2018-04-24 16:15:10 +0200 |
---|---|---|
committer | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2018-04-24 16:15:10 +0200 |
commit | 132711f4a6792b4738908a21477c8241bbf3cbbd (patch) | |
tree | a2ce3323b407805256023378d98b186121c43e4f /src/test/resources | |
parent | b7091047a9d3607cea0141570c52da9487762303 (diff) |
Remove enodeB code
Remove useless code for operational policy
Issue-ID: CLAMP-153
Change-Id: Ib63b98f19656116935f0f8b325fc0f8b739f6c59
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test/resources')
3 files changed, 36 insertions, 161 deletions
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/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: |