Add CSITs for rollback handling

Issue-ID: POLICY-5471
Change-Id: I6b27fb9564834eec0b363b90b08377398dfc56f1
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

diff --git a/csit/resources/tests/clamp-common.robot b/csit/resources/tests/clamp-common.robot
index a2db40c..9a23740 100644 (file)
--- a/csit/resources/tests/clamp-common.robot
+++ b/csit/resources/tests/clamp-common.robot
@@ -198,45 +198,27 @@ VerifyUninstantiated
     Run Keyword If  ${resp.status_code}==200  Length Should Be  ${resp.json()['automationCompositionList']}  0
 
 SetParticipantSimFail
     Run Keyword If  ${resp.status_code}==200  Length Should Be  ${resp.json()['automationCompositionList']}  0
 
 SetParticipantSimFail

+    [Arguments]  ${domain}

     [Documentation]  Set Participant Simulator Fail.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesFail.json
     [Documentation]  Set Participant Simulator Fail.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesFail.json

-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM1_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
-
-SetParticipantSim2Fail
-    [Documentation]  Set Participant Simulator2 Fail.
-    ${auth}=    ParticipantAuth
-    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesFail.json
-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM2_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    ${resp}=   MakeJsonPutRequest  participant  ${domain}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}

     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimSuccess
     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimSuccess

+    [Arguments]  ${domain}

     [Documentation]  Set Participant Simulator Success.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesSuccess.json
     [Documentation]  Set Participant Simulator Success.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesSuccess.json

-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM1_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
-
-SetParticipantSim2Success
-    [Documentation]  Set Participant Simulator Success.
-    ${auth}=    ParticipantAuth
-    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesSuccess.json
-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM2_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    ${resp}=   MakeJsonPutRequest  participant  ${domain}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}

     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimTimeout
     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimTimeout

+    [Arguments]  ${domain}

     [Documentation]  Set Participant Simulator Timeout.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesTimeout.json
     [Documentation]  Set Participant Simulator Timeout.
     ${auth}=    ParticipantAuth
     ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesTimeout.json

-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM1_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
-
-SetParticipantSim2Timeout
-    [Documentation]  Set Participant Simulator Timeout.
-    ${auth}=    ParticipantAuth
-    ${postjson}=  Get file  ${CURDIR}/data/SettingSimPropertiesTimeout.json
-    ${resp}=   MakeJsonPutRequest  participant  ${HTTP_PARTICIPANT_SIM2_IP}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}
+    ${resp}=   MakeJsonPutRequest  participant  ${domain}  /onap/policy/simparticipant/v2/parameters  ${postjson}  ${auth}

     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimDelay
     Should Be Equal As Strings    ${resp.status_code}     200
 
 SetParticipantSimDelay


@@ -328,6 +310,16 @@ UndeployAndDeleteAutomationComposition
     DeleteAutomationComposition  ${compositionId}  ${instanceId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionId}
 
     DeleteAutomationComposition  ${compositionId}  ${instanceId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionId}
 

+MigrateAc
+    [Arguments]   ${postyaml}  ${theCompositionId}  ${theCompositionTargetId}  ${theInstanceId}  ${theText}
+    ${auth}=    ClampAuth
+    ${updatedpostyaml}=   Replace String     ${postyaml}            COMPOSITIONIDPLACEHOLDER             ${theCompositionId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${theCompositionTargetId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER                 ${theInstanceId}
+    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER                      ${theText}
+    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${theCompositionId}/instances  ${updatedpostyaml}  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     200
+

 MakePostRequest
     [Arguments]  ${name}  ${domain}  ${url}  ${auth}
     Log    Creating session http://${domain}
 MakePostRequest
     [Arguments]  ${name}  ${domain}  ${url}  ${auth}
     Log    Creating session http://${domain}


@@ -392,4 +384,4 @@ VerifyHttpInTraces
     ${params}=    Create Dictionary    service=${service}    tags=${tags_json}    operation=http put /v2/compositions/{compositionId}    lookback=1h    limit=10
     ${resp}=  GET On Session  jaeger  /api/traces  params=${params}    expected_status=200
     Log  Received response from jaeger ${resp.text}
     ${params}=    Create Dictionary    service=${service}    tags=${tags_json}    operation=http put /v2/compositions/{compositionId}    lookback=1h    limit=10
     ${resp}=  GET On Session  jaeger  /api/traces  params=${params}    expected_status=200
     Log  Received response from jaeger ${resp.text}

-    RETURN  ${resp}
\ No newline at end of file
+    RETURN  ${resp}

diff --git a/csit/resources/tests/clamp-db-restore.robot b/csit/resources/tests/clamp-db-restore.robot
index 420c54a..10bf545 100644 (file)
--- a/csit/resources/tests/clamp-db-restore.robot
+++ b/csit/resources/tests/clamp-db-restore.robot
@@ -26,7 +26,7 @@ AcMigrationRestored
     set Suite variable  ${compositionIdRestored}  d30b8017-4d64-4693-84d7-de9c4226b9f8
     set Suite variable  ${InstanceIdRestored}  dd36aaa4-580f-4193-a52b-37c3a955b11a
     set Suite variable  ${compositionTargetIdRestored}  6c1cf107-a2ca-4485-8129-02f9fae64d64
     set Suite variable  ${compositionIdRestored}  d30b8017-4d64-4693-84d7-de9c4226b9f8
     set Suite variable  ${InstanceIdRestored}  dd36aaa4-580f-4193-a52b-37c3a955b11a
     set Suite variable  ${compositionTargetIdRestored}  6c1cf107-a2ca-4485-8129-02f9fae64d64

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     ${auth}=    ClampAuth
     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-restored.yaml
     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionIdRestored}/instances  ${postyaml}  ${auth}
     ${auth}=    ClampAuth
     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-restored.yaml
     ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionIdRestored}/instances  ${postyaml}  ${auth}


@@ -85,4 +85,4 @@ GetInstances
 AcDeleteRestored2
     [Documentation]  Undeploy and delete of an automation composition restored.
     UndeployAndDeleteAutomationComposition  ${compositionIdRestored}  ${InstanceIdRestored}
 AcDeleteRestored2
     [Documentation]  Undeploy and delete of an automation composition restored.
     UndeployAndDeleteAutomationComposition  ${compositionIdRestored}  ${InstanceIdRestored}

-    DePrimeAndDeleteACDefinition   ${compositionIdRestored}
\ No newline at end of file
+    DePrimeAndDeleteACDefinition   ${compositionIdRestored}

diff --git a/csit/resources/tests/clamp-migrate-rollback.robot b/csit/resources/tests/clamp-migrate-rollback.robot
index df9b7ae..9494826 100644 (file)
--- a/csit/resources/tests/clamp-migrate-rollback.robot
+++ b/csit/resources/tests/clamp-migrate-rollback.robot
@@ -40,14 +40,14 @@ PrimeACDefinitions
 
 FailPrimeACDefinitionFrom
     [Documentation]  Prime automation composition definition Migration From with Fail.
 
 FailPrimeACDefinitionFrom
     [Documentation]  Prime automation composition definition Migration From with Fail.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionFromId}   FAILED
 
 PrimeACDefinitionFrom
     [Documentation]  Prime automation composition definition Migration From.
     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionFromId}   FAILED
 
 PrimeACDefinitionFrom
     [Documentation]  Prime automation composition definition Migration From.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  PRIMED
     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyPriming  ${compositionFromId}  PRIMED


@@ -85,16 +85,16 @@ InstantiateAutomationCompositionTimeout
 
 DeployAutomationCompositionTimeout
     [Documentation]  Deploy automation composition timeout.
 
 DeployAutomationCompositionTimeout
     [Documentation]  Deploy automation composition timeout.

-    SetParticipantSimTimeout
-    SetParticipantSim2Timeout
+    SetParticipantSimTimeout  ${HTTP_PARTICIPANT_SIM1_IP}
+    SetParticipantSimTimeout  ${HTTP_PARTICIPANT_SIM2_IP}

     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}  ${instanceTimeoutId}   ${postjson}
     Wait Until Keyword Succeeds    5 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceTimeoutId}  TIMEOUT
 
 DeleteAutomationCompositionTimeout
     [Documentation]  Delete automation composition timeout.
     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}  ${instanceTimeoutId}   ${postjson}
     Wait Until Keyword Succeeds    5 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceTimeoutId}  TIMEOUT
 
 DeleteAutomationCompositionTimeout
     [Documentation]  Delete automation composition timeout.

-    SetParticipantSimSuccess
-    SetParticipantSim2Success
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM2_IP}

     UndeployAndDeleteAutomationComposition  ${compositionFromId}  ${instanceTimeoutId}
 
 InstantiateAutomationCompositionMigrationFrom
     UndeployAndDeleteAutomationComposition  ${compositionFromId}  ${instanceTimeoutId}
 
 InstantiateAutomationCompositionMigrationFrom


@@ -106,16 +106,16 @@ InstantiateAutomationCompositionMigrationFrom
 
 FailPrepareAutomationCompositionMigrationFrom
     [Documentation]  Fail Prepare automation composition migration.
 
 FailPrepareAutomationCompositionMigrationFrom
     [Documentation]  Fail Prepare automation composition migration.

-    SetParticipantSimFail
-    SetParticipantSim2Fail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM2_IP}

     ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
     ChangeStatusAutomationComposition   ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
 
 PrepareAutomationCompositionMigrationFrom
     [Documentation]  Prepare automation composition migration.
     ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
     ChangeStatusAutomationComposition   ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
 
 PrepareAutomationCompositionMigrationFrom
     [Documentation]  Prepare automation composition migration.

-    SetParticipantSimSuccess
-    SetParticipantSim2Success
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM2_IP}

     ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
     ChangeStatusAutomationComposition   ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
     ${postjson}=  Get file  ${CURDIR}/data/PrepareAC.json
     ChangeStatusAutomationComposition   ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}


@@ -123,7 +123,7 @@ PrepareAutomationCompositionMigrationFrom
 
 FailDeployAutomationCompositionMigration
     [Documentation]  Fail Deploy automation composition.
 
 FailDeployAutomationCompositionMigration
     [Documentation]  Fail Deploy automation composition.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED


@@ -160,7 +160,7 @@ QueryPolicyTypes
 
 DeployAutomationCompositionMigration
     [Documentation]  Deploy automation composition.
 
 DeployAutomationCompositionMigration
     [Documentation]  Deploy automation composition.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED


@@ -183,14 +183,14 @@ SendOutPropertiesToRuntime
 
 FailReviewAutomationCompositionMigrationFrom
     [Documentation]  Fail Review automation composition migration.
 
 FailReviewAutomationCompositionMigrationFrom
     [Documentation]  Fail Review automation composition migration.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
 
 ReviewAutomationCompositionMigrationFrom
     [Documentation]  Review automation composition migration.
     ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
 
 ReviewAutomationCompositionMigrationFrom
     [Documentation]  Review automation composition migration.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
     ${postjson}=  Get file  ${CURDIR}/data/ReviewAC.json
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    10 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}


@@ -210,26 +210,14 @@ AutomationCompositionUpdate
 
 PrecheckAutomationCompositionMigration
     [Documentation]  Precheck Migration of an automation composition.
 
 PrecheckAutomationCompositionMigration
     [Documentation]  Precheck Migration of an automation composition.

-    ${auth}=    ClampAuth

     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-precheck-migration.yaml
     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-precheck-migration.yaml

-    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
+    MigrateAc  ${postyaml}  ${compositionFromId}  ${compositionToId}  ${instanceMigrationId}  TextForMigration

     Wait Until Keyword Succeeds    2 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
 
 AutomationCompositionMigrationTo
     [Documentation]  Migration of an automation composition.
     Wait Until Keyword Succeeds    2 min    5 sec    VerifySubStatus  ${compositionFromId}  ${instanceMigrationId}
 
 AutomationCompositionMigrationTo
     [Documentation]  Migration of an automation composition.

-    ${auth}=    ClampAuth

     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml

-    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
+    MigrateAc  ${postyaml}  ${compositionFromId}  ${compositionToId}  ${instanceMigrationId}  TextForMigration

     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  DEPLOYED
     VerifyPropertiesUpdated  ${compositionToId}  ${instanceMigrationId}  TextForMigration
     VerifyParticipantSim  ${instanceMigrationId}  TextForMigration
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  DEPLOYED
     VerifyPropertiesUpdated  ${compositionToId}  ${instanceMigrationId}  TextForMigration
     VerifyParticipantSim  ${instanceMigrationId}  TextForMigration


@@ -240,45 +228,39 @@ AutomationCompositionMigrationTo
 
 FailAutomationCompositionMigration
     [Documentation]  Fail Migration of an automation composition.
 
 FailAutomationCompositionMigration
     [Documentation]  Fail Migration of an automation composition.

-    SetParticipantSimFail
-    ${auth}=    ClampAuth
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-fail.yaml
     ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-fail.yaml

-    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionToId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionFromId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionToId}/instances  ${updatedpostyaml}  ${auth}
-    Should Be Equal As Strings    ${resp.status_code}     200
+    MigrateAc  ${postyaml}  ${compositionToId}  ${compositionFromId}  ${instanceMigrationId}  TextForMigration

     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnInstantiateAutomationComposition
     [Documentation]  UnDeploy and Delete automation composition instance.
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnInstantiateAutomationComposition
     [Documentation]  UnDeploy and Delete automation composition instance.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     UndeployAndDeleteAutomationComposition  ${compositionId}  ${instanceId}
 
 FailUnDeployAutomationCompositionMigrationTo
     [Documentation]  Fail UnDeploy automation composition migrated.
     UndeployAndDeleteAutomationComposition  ${compositionId}  ${instanceId}
 
 FailUnDeployAutomationCompositionMigrationTo
     [Documentation]  Fail UnDeploy automation composition migrated.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
     ChangeStatusAutomationComposition  ${compositionToId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnDeployAutomationCompositionMigrationTo
     [Documentation]  UnDeploy automation composition migrated.
     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
     ChangeStatusAutomationComposition  ${compositionToId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnDeployAutomationCompositionMigrationTo
     [Documentation]  UnDeploy automation composition migrated.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
     ChangeStatusAutomationComposition  ${compositionToId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  UNDEPLOYED
 
 FailUnInstantiateAutomationCompositionMigrationTo
     [Documentation]  Fail Delete automation composition instance migrated.
     ${postjson}=  Get file  ${CURDIR}/data/UndeployAC.json
     ChangeStatusAutomationComposition  ${compositionToId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionToId}  ${instanceMigrationId}  UNDEPLOYED
 
 FailUnInstantiateAutomationCompositionMigrationTo
     [Documentation]  Fail Delete automation composition instance migrated.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     DeleteAutomationComposition  ${compositionToId}  ${instanceMigrationId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnInstantiateAutomationCompositionMigrationTo
     [Documentation]  Delete automation composition instance migrated.
     DeleteAutomationComposition  ${compositionToId}  ${instanceMigrationId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionToId}  ${instanceMigrationId}  FAILED
 
 UnInstantiateAutomationCompositionMigrationTo
     [Documentation]  Delete automation composition instance migrated.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     DeleteAutomationComposition  ${compositionToId}  ${instanceMigrationId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionToId}
 
     DeleteAutomationComposition  ${compositionToId}  ${instanceMigrationId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${compositionToId}
 


@@ -296,67 +278,54 @@ DeployAutomationCompositionRollback
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
 
     ChangeStatusAutomationComposition  ${compositionFromId}   ${instanceMigrationId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
 

-# Enable the rollback tests once the logic is refactored in clamp
-#FailAutomationCompositionMigrationRollback
-#    [Documentation]  Fail Migration of an automation composition for testing rollback.
-#    SetParticipantSimFail
-#    ${auth}=    ClampAuth
-#    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
-#    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-#    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-#    Should Be Equal As Strings    ${resp.status_code}     200
-#    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
-
-#RollbackAutomationComposition
-#    [Documentation]  Rollback of an automation composition.
-#    SetParticipantSimSuccess
-#    ${auth}=    ClampAuth
-#    ${resp}=   MakePostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}/rollback  ${auth}
-#    Should Be Equal As Strings    ${resp.status_code}     202
-#    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
-#    VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextInit
-#    VerifyParticipantSim  ${instanceMigrationId}  MyTextInit
-#    VerifyRollbackElementsRuntime  ${compositionFromId}  ${instanceMigrationId}
-#    VerifyRollbackElementsSim  ${instanceMigrationId}
-
-#FailAutomationCompositionMigrationRollback2
-#    [Documentation]  Fail Migration of an automation composition for testing rollback.
-#    SetParticipantSimFail
-#    ${auth}=    ClampAuth
-#    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
-#    ${updatedpostyaml}=   Replace String     ${postyaml}     COMPOSITIONIDPLACEHOLDER       ${compositionFromId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     COMPOSITIONTARGETIDPLACEHOLDER       ${compositionToId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     INSTACEIDPLACEHOLDER       ${instanceMigrationId}
-#    ${updatedpostyaml}=   Replace String     ${updatedpostyaml}     TEXTPLACEHOLDER       TextForMigration
-#    ${resp}=   MakeYamlPostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances  ${updatedpostyaml}  ${auth}
-#    Should Be Equal As Strings    ${resp.status_code}     200
-#    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
-
-#FailRollbackAutomationComposition
-#    [Documentation]  Fail Rollback of an automation composition.
-#    ${auth}=    ClampAuth
-#    ${resp}=   MakePostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}/rollback   ${auth}
-#    Should Be Equal As Strings    ${resp.status_code}     202
-#    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
+FailAutomationCompositionMigrationRollback
+    [Documentation]  Fail Migration of an automation composition for testing rollback.
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
+    MigrateAc  ${postyaml}  ${compositionFromId}  ${compositionToId}  ${instanceMigrationId}  TextForMigration
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
+
+RollbackAutomationComposition
+    [Documentation]  Rollback of an automation composition.
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}
+    ${auth}=    ClampAuth
+    ${resp}=   MakePostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}/rollback  ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyDeployStatus  ${compositionFromId}  ${instanceMigrationId}  DEPLOYED
+    VerifyPropertiesUpdated  ${compositionFromId}  ${instanceMigrationId}  MyTextInit
+    VerifyParticipantSim  ${instanceMigrationId}  MyTextInit
+    VerifyRollbackElementsRuntime  ${compositionFromId}  ${instanceMigrationId}
+    VerifyRollbackElementsSim  ${instanceMigrationId}
+
+FailAutomationCompositionMigrationRollback2
+    [Documentation]  Fail Migration of an automation composition for testing rollback.
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}
+    ${postyaml}=  Get file  ${CURDIR}/data/ac-instance-migration-to.yaml
+    MigrateAc  ${postyaml}  ${compositionFromId}  ${compositionToId}  ${instanceMigrationId}  TextForMigration
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED
+
+FailRollbackAutomationComposition
+    [Documentation]  Fail Rollback of an automation composition.
+    ${auth}=    ClampAuth
+    ${resp}=   MakePostRequest  ACM  ${POLICY_RUNTIME_ACM_IP}  /onap/policy/clamp/acm/v2/compositions/${compositionFromId}/instances/${instanceMigrationId}/rollback   ${auth}
+    Should Be Equal As Strings    ${resp.status_code}     202
+    Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${compositionFromId}  ${instanceMigrationId}  FAILED

 
 UnInstantiateAutomationCompositionRollback
     [Documentation]  Undeploy and Delete automation composition instance in fail rollback.
 
 UnInstantiateAutomationCompositionRollback
     [Documentation]  Undeploy and Delete automation composition instance in fail rollback.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     UndeployAndDeleteAutomationComposition  ${compositionFromId}  ${instanceMigrationId}
 
 FailDePrimeACDefinitionsFrom
     [Documentation]  Fail DePrime automation composition definition migration From.
     UndeployAndDeleteAutomationComposition  ${compositionFromId}  ${instanceMigrationId}
 
 FailDePrimeACDefinitionsFrom
     [Documentation]  Fail DePrime automation composition definition migration From.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionFromId}   FAILED
 
 DeleteACDefinitionFrom
     [Documentation]  DePrime and Delete automation composition definition migration From.
     ${postjson}=  Get file  ${CURDIR}/data/ACDepriming.json
     PrimeACDefinition  ${postjson}  ${compositionFromId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionFromId}   FAILED
 
 DeleteACDefinitionFrom
     [Documentation]  DePrime and Delete automation composition definition migration From.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     DePrimeAndDeleteACDefinition  ${compositionFromId}
 
 DeleteACDefinitions
     DePrimeAndDeleteACDefinition  ${compositionFromId}
 
 DeleteACDefinitions

diff --git a/csit/resources/tests/clamp-single-element-test.robot b/csit/resources/tests/clamp-single-element-test.robot
index 1b5c619..8a78ace 100644 (file)
--- a/csit/resources/tests/clamp-single-element-test.robot
+++ b/csit/resources/tests/clamp-single-element-test.robot
@@ -31,7 +31,7 @@ InstantiateAutomationCompositionSimple
 
 FailDeployAutomationCompositionSimple
     [Documentation]  Fail Simple Deploy automation composition.
 
 FailDeployAutomationCompositionSimple
     [Documentation]  Fail Simple Deploy automation composition.

-    SetParticipantSimFail
+    SetParticipantSimFail  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${simpleCompositionId}   ${simpleInstanceId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${simpleCompositionId}  ${simpleInstanceId}  FAILED
     ${postjson}=  Get file  ${CURDIR}/data/DeployAC.json
     ChangeStatusAutomationComposition  ${simpleCompositionId}   ${simpleInstanceId}  ${postjson}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResult  ${simpleCompositionId}  ${simpleInstanceId}  FAILED


@@ -48,10 +48,10 @@ UnDeployAutomationCompositionSimple
 
 UnInstantiateAutomationCompositionSimple
     [Documentation]  Delete simple automation composition instance.
 
 UnInstantiateAutomationCompositionSimple
     [Documentation]  Delete simple automation composition instance.

-    SetParticipantSimSuccess
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}

     DeleteAutomationComposition  ${simpleCompositionId}  ${simpleInstanceId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${simpleCompositionId}
 
 DeleteACDefinitionSimple
     [Documentation]  DePrime and Delete simple automation composition definition.
     DeleteAutomationComposition  ${simpleCompositionId}  ${simpleInstanceId}
     Wait Until Keyword Succeeds    1 min    5 sec    VerifyUninstantiated  ${simpleCompositionId}
 
 DeleteACDefinitionSimple
     [Documentation]  DePrime and Delete simple automation composition definition.

-    DePrimeAndDeleteACDefinition  ${simpleCompositionId}
\ No newline at end of file
+    DePrimeAndDeleteACDefinition  ${simpleCompositionId}

diff --git a/csit/resources/tests/clamp-timeout-test.robot b/csit/resources/tests/clamp-timeout-test.robot
index a38b899..b430d18 100644 (file)
--- a/csit/resources/tests/clamp-timeout-test.robot
+++ b/csit/resources/tests/clamp-timeout-test.robot
@@ -19,12 +19,12 @@ CommissionAcDefinitionTimeout
 
 TimeoutPrimeACDefinition
     [Documentation]  Prime automation composition definition Timeout.
 
 TimeoutPrimeACDefinition
     [Documentation]  Prime automation composition definition Timeout.

-    SetParticipantSimTimeout
+    SetParticipantSimTimeout  ${HTTP_PARTICIPANT_SIM1_IP}

     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionTimeoutId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionTimeoutId}   TIMEOUT
 
 DeleteACDefinitionTimeout
     [Documentation]  DePrime and Delete automation composition definition Timeout.
     ${postjson}=  Get file  ${CURDIR}/data/ACPriming.json
     PrimeACDefinition  ${postjson}  ${compositionTimeoutId}
     Wait Until Keyword Succeeds    2 min    5 sec    VerifyStateChangeResultPriming  ${compositionTimeoutId}   TIMEOUT
 
 DeleteACDefinitionTimeout
     [Documentation]  DePrime and Delete automation composition definition Timeout.

-    SetParticipantSimSuccess
-    DePrimeAndDeleteACDefinition  ${compositionTimeoutId}
\ No newline at end of file
+    SetParticipantSimSuccess  ${HTTP_PARTICIPANT_SIM1_IP}
+    DePrimeAndDeleteACDefinition  ${compositionTimeoutId}