[PMSH] Remove CBS sim from the suit

Issue-ID: DCAEGEN2-3101
Change-Id: I5713a15a277a29555b632dde1577fe6d399559fb
Signed-off-by: SagarS <sagar.shetty@est.tech>

2 files changed, 1 insertions, 141 deletions

diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
deleted file mode 100644
index e6d0ef97..00000000
--- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+++ /dev/null
@@ -1,124 +0,0 @@
-[
-  {
-    "httpRequest": {
-      "path": "/service_component_all/.*"
-    },
-    "httpResponse": {
-      "statusCode": 200,
-      "headers": {
-        "content-type": [
-          "application/json"
-        ]
-      },
-      "body": {
-        "type": "JSON",
-        "json": {
-          "config": {
-            "control_loop_name": "pmsh-control-loop",
-            "operational_policy_name": "pmsh-operational-policy",
-            "cert_path": "/opt/app/pmsh/etc/certs/cert.pem",
-            "enable_tls": true,
-            "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
-            "pmsh_policy": {
-              "subscription": {
-                "subscriptionName": "ExtraPM-All-gNB-R2B",
-                "administrativeState": "UNLOCKED",
-                "fileBasedGP": 15,
-                "fileLocation":"\/pm\/pm.xml",
-                "nfFilter": {
-                  "nfNames": [
-                    "^pnf.*",
-                    "^vnf.*"
-                  ],
-                  "modelInvariantIDs": [
-                    "7129e420-d396-4efb-af02-6b83499b12f8"
-                  ],
-                  "modelVersionIDs": [
-                  ],
-                  "modelNames": [
-                  ]
-                },
-                "measurementGroups": [
-                  {
-                    "measurementGroup": {
-                      "measurementTypes": [
-                        {
-                          "measurementType": "countera"
-                        },
-                        {
-                          "measurementType": "counterb"
-                        }
-                      ],
-                      "managedObjectDNsBasic": [
-                        {
-                          "DN": "dna"
-                        },
-                        {
-                          "DN": "dnb"
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "measurementGroup": {
-                      "measurementTypes": [
-                        {
-                          "measurementType": "counterc"
-                        },
-                        {
-                          "measurementType": "counterd"
-                        }
-                      ],
-                      "managedObjectDNsBasic": [
-                        {
-                          "DN": "dnc"
-                        },
-                        {
-                          "DN": "dnd"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            },
-            "streams_publishes": {
-              "policy_pm_publisher": {
-                "dmaap_info": {
-                  "client_id": "1475976809466",
-                  "client_role": "org.onap.dcae.pmPublisher",
-                  "topic_url": "http://mr-sim:3904/events/unauthenticated.DCAE_CL_OUTPUT",
-                  "location": "san-francisco"
-                },
-                "type": "message_router"
-              }
-            },
-            "streams_subscribes": {
-              "aai_subscriber": {
-                "type": "message_router",
-                "dmaap_info": {
-                  "client_id": "1575976809466",
-                  "client_role": "org.onap.dcae.aaiSub",
-                  "topic_url": "http://mr-sim:3904/events/AAI-EVENT",
-                  "location": "san-francisco"
-                }
-              },
-              "policy_pm_subscriber": {
-                "dmaap_info": {
-                  "location": "san-francisco",
-                  "topic_url": "http://mr-sim:3904/events/unauthenticated.PMSH_CL_INPUT",
-                  "client_role": "org.onap.dcae.pmSubscriber",
-                  "client_id": "1575876809456"
-                },
-                "type": "message_router"
-              }
-            },
-            "key_path": "/opt/app/pmsh/etc/certs/key.pem",
-            "aaf_identity": "dcae@dcae.onap.org",
-            "aaf_password": "demo123456!"
-          }
-        }
-      }
-    }
-  }
-]
diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
index 44052b69..530268bf 100644
--- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
+++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
@@ -14,7 +14,6 @@ Test Teardown     Delete All Sessions
 
 ${PMSH_BASE_URL}                    https://${PMSH_IP}:8443
 ${MR_SIM_BASE_URL}                  http://${MR_SIM_IP_ADDRESS}:3904
-${CBS_BASE_URL}                     https://${CBS_SIM_IP_ADDRESS}:10443
 ${SUBSCRIPTION_ENDPOINT}            /subscription
 
 ${MR_SIM_RESET}                             %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-sim-reset.json
@@ -22,7 +21,6 @@ ${MR_AAI_PNF_CREATED}                       %{WORKSPACE}/tests/dcaegen2-services
 ${MR_AAI_PNF_REMOVED}                       %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/aai-pnf-delete.json
 ${MR_POLICY_RESPONSE_PNF_EXISTING}          %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-created-pnf-existing.json
 ${MR_POLICY_RESPONSE_PNF_DELETED}           %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-deleted-pnf-existing.json
-${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED}     %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
 ${CREATE_SUBSCRIPTION_DATA}                 %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json
 ${CREATE_SECOND_SUBSCRIPTION_DATA}          %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_second_subscription_request.json
 ${CREATE_SUBSCRIPTION_BAD_DATA}             %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json
@@ -59,8 +57,6 @@ Verify PNF detected in AAI when administrative state unlocked
     [Tags]                          PMSH_03
     [Documentation]                 Verify PNF detected when administrative state unlocked
     [Timeout]                       60 seconds
-    SetAdministrativeStateToUnlocked
-    Sleep                           31             Allow PMSH time to pick up changes in CBS config
     ${resp}=                        GetMeasGrpCall    /subscription/subs_01/measurementGroups/msg_grp_01
     Should Be Equal As Strings      ${resp.json()['subscriptionName']}      subs_01
     Should Be Equal As Strings      ${resp.json()['administrativeState']}       UNLOCKED
@@ -205,13 +201,10 @@ Verify Measurement Group admin status update from Locking to Locked
     ${nf_length}=                   Get length  ${resp.json()['networkFunctions']}
     Should be equal as numbers      ${nf_length}  0
 
-Verify Update Measurement Group admin status to unlocked with no Network Functions in Subscription
+Verify Update Measurement Group admin status to unlocked
     [Tags]                          PMSH_17
     [Documentation]                 Verify Update Measurement Group admin status to unlocked with no Network Functions in Subscription
     [Timeout]                       60 seconds
-    ${resp}=                        GetSubsCall    ${SUBSCRIPTION_ENDPOINT}/subs_01  ""
-    ${nf_length}=                   Get length  ${resp.json()['subscription']['nfs']}
-    Should be equal as numbers      ${nf_length}  0
     ${json_string}=                 Set Variable    {"administrativeState": "UNLOCKED"}
     ${json}=                        evaluate        json.loads('''${json_string}''')    json
     ${resp}=                        PutMsgGrpStatusCall     /subscription/subs_01/measurementGroups/msg_grp_01/adminState   ${json}
@@ -287,15 +280,6 @@ Verify Get subscriptions with Network Functions
 
 *** Keywords ***
 
-SetAdministrativeStateToUnlocked
-    ${data}=            Get Data From File      ${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED}
-    Create Session      cbs_sim_session   ${CBS_BASE_URL}    verify=false
-    ${resp}=            PUT On Session    cbs_sim_session    url=/clear  data={"path": "/service_component_all/.*"}
-    Should Be True      ${resp.status_code} == 200
-    Sleep               2                 Allow CBS time to set expectation
-    ${resp} =           PUT On Session    cbs_sim_session    url=/expectation     data=${data}
-    Should Be True      ${resp.status_code} == 201
-
 AddCreatePolicyResponeToMrSim
     ${data}=            Get Data From File      ${MR_POLICY_RESPONSE_PNF_EXISTING}
     Create Session      mr_sim_session   ${MR_SIM_BASE_URL}    verify=false