Merge "Fix CLAMP controlloop CSIT testcases"

1 files changed, 43 insertions, 43 deletions

diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot
index c9ad34af..fe241333 100644
--- a/csit/clamp/tests/policy-clamp-test.robot
+++ b/csit/clamp/tests/policy-clamp-test.robot
@@ -6,42 +6,42 @@ Library     json
 
 *** Test Cases ***
 
-CommissionControlLoopV1
-     [Documentation]  Commission control loop.
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     Log    Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970
-     ${postyaml}=  Get file  ${CURDIR}/data/PMSHMultipleCLTosca.yaml
-     ${session}=    Create Session      policy  http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970   auth=${auth}
+CommissionAutomationCompositionV1
+     [Documentation]  Commission automation composition.
+     ${auth}=    Create List    runtimeUser    zb!XztG34
+     Log    Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+     ${postyaml}=  Get file  ${CURDIR}/data/PMSHMultipleACTosca.yaml
+     ${session}=    Create Session      policy  https://${POLICY_RUNTIME_ACM_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
-     ${resp}=   POST On Session     policy  /onap/controlloop/v2/commission   data=${postyaml}  headers=${headers}
-     Log    Received response from controlloop runtime ${resp.text}
+     ${resp}=   POST On Session     policy  /onap/policy/clamp/acm/v2/commission   data=${postyaml}  headers=${headers}
+     Log    Received response from runtime acm ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
 
-InstantiateControlLoopV1
-     [Documentation]  Instantiate control loop.
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     Log    Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970
-     ${postjson}=  Get file  ${CURDIR}/data/InstantiateCL.json
-     ${session}=    Create Session      policy  http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970   auth=${auth}
+InstantiateAutomationCompositionV1
+     [Documentation]  Instantiate automation composition.
+     ${auth}=    Create List    runtimeUser    zb!XztG34
+     Log    Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+     ${postjson}=  Get file  ${CURDIR}/data/InstantiateAC.json
+     ${session}=    Create Session      policy  https://${POLICY_RUNTIME_ACM_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   POST On Session     policy  /onap/controlloop/v2/instantiation   data=${postjson}  headers=${headers}
-     Log    Received response from controlloop runtime ${resp.text}
+     ${resp}=   POST On Session     policy  /onap/policy/clamp/acm/v2/instantiation   data=${postjson}  headers=${headers}
+     Log    Received response from runtime acm ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
 
-PassivateControlLoop
-     [Documentation]  Passivate control loop.
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     Log    Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970
-     ${postjson}=  Get file  ${CURDIR}/data/PassivateCL.json
-     ${session}=    Create Session      policy  http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970   auth=${auth}
+PassivateAutomationComposition
+     [Documentation]  Passivate automation composition.
+     ${auth}=    Create List    runtimeUser    zb!XztG34
+     Log    Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+     ${postjson}=  Get file  ${CURDIR}/data/PassivateAC.json
+     ${session}=    Create Session      policy  https://${POLICY_RUNTIME_ACM_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   PUT On Session     policy  /onap/controlloop/v2/instantiation/command   data=${postjson}  headers=${headers}
-     Log    Received response from controlloop runtime ${resp.text}
+     ${resp}=   PUT On Session     policy  /onap/policy/clamp/acm/v2/instantiation/command   data=${postjson}  headers=${headers}
+     Log    Received response from runtime acm ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     202
 
 QueryPolicies
      [Documentation]    Runs Policy Participant Query New Policies
-     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${auth}=    Create List    policyadmin    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -51,7 +51,7 @@ QueryPolicies
 
 QueryPolicyTypes
      [Documentation]    Runs Policy Participant Query New Policy Types
-     ${auth}=    Create List    healthcheck    zb!XztG34
+     ${auth}=    Create List    policyadmin    zb!XztG34
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
@@ -59,24 +59,24 @@ QueryPolicyTypes
      Log    Received response from policy-api ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
 
-StateChangeRunningControlLoop
-     [Documentation]  ControlLoop State Change to RUNNING.
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     Log    Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970
-     ${postjson}=  Get file  ${CURDIR}/data/StateChangeRunningCL.json
-     ${session}=    Create Session      policy  http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970   auth=${auth}
+StateChangeRunningAutomationComposition
+     [Documentation]  AutomationComposition State Change to RUNNING.
+     ${auth}=    Create List    runtimeUser    zb!XztG34
+     Log    Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+     ${postjson}=  Get file  ${CURDIR}/data/StateChangeRunningAC.json
+     ${session}=    Create Session      policy  https://${POLICY_RUNTIME_ACM_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   PUT On Session     policy  /onap/controlloop/v2/instantiation/command   data=${postjson}  headers=${headers}  expected_status=406
-     Log    Received response from controlloop runtime ${resp.text}
+     ${resp}=   PUT On Session     policy  /onap/policy/clamp/acm/v2/instantiation/command   data=${postjson}  headers=${headers}  expected_status=406
+     Log    Received response from runtime acm ${resp.text}
 
-QueryInstantiatedCLs
-     [Documentation]    Get Instantiated ControlLoops
-     ${auth}=    Create List    healthcheck    zb!XztG34
-     Log    Creating session http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970
-     ${session}=    Create Session      policy  http://${POLICY_CONTROLLOOP_RUNTIME_IP}:6970   auth=${auth}
+QueryInstantiatedACs
+     [Documentation]    Get Instantiated AutomationCompositions
+     ${auth}=    Create List    runtimeUser    zb!XztG34
+     Log    Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+     ${session}=    Create Session      policy  https://${POLICY_RUNTIME_ACM_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   GET On Session     policy  /onap/controlloop/v2/instantiation     headers=${headers}
-     Log    Received response from controlloop runtime ${resp.text}
+     ${resp}=   GET On Session     policy  /onap/policy/clamp/acm/v2/instantiation     headers=${headers}
+     Log    Received response from runtime acm ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
-     Should Be Equal As Strings  ${resp.json()['controlLoopList'][0]['state']}  UNINITIALISED2PASSIVE
-     Should Be Equal As Strings  ${resp.json()['controlLoopList'][0]['orderedState']}  RUNNING
+     Should Be Equal As Strings  ${resp.json()['automationCompositionList'][0]['state']}  UNINITIALISED2PASSIVE
+     Should Be Equal As Strings  ${resp.json()['automationCompositionList'][0]['orderedState']}  RUNNING