[patch] Fix for sanity tests in manage (#255)

Author: whitfiea

instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-sanity.yaml

@@ -7,10 +7,10 @@
 {{ $ns               :=  .Values.mas_app_namespace }}
 {{ $np_name          :=  "postsync-sanity-manage-np" }}
 {{ $role_name        :=  "postsync-sanity-manage-role" }}
-{{ $crole_name       :=  "postsync-verify-manage-crole" }}
-{{ $sa_name          :=  "postsync-sanity-manage-sa" }}
+{{ $crole_name       :=  printf "postsync-sanity-manage-crole-%s" .Values.instance_id }}
+{{ $sa_name          :=  printf "postsync-sanity-manage-sa-%s" .Values.instance_id }}
 {{ $rb_name          :=  "postsync-sanity-manage-rb" }}
-{{ $crb_name         :=  "postsync-verify-manage-crb" }}
+{{ $crb_name         :=  printf "postsync-sanity-manage-crb-%s" .Values.instance_id }}
 {{ $tests_cm_name    :=  "postsync-sanity-tests-manage-cm" }}
 {{ $record_cm_name   :=  "postsync-sanity-tests-manage-record-cm" }}
 {{ $job_name         :=  "postsync-sanity-manage-job" }}
@@ -915,9 +915,6 @@ data:
     def test_asset_crud_operation_using_new_added_user(manage_host_ca_filepath):
         #Check if asset exists, delete it if present
         assetid = get_asset(asset, session, manage_host_ca_filepath)
-        if assetid is not None:
-            logger.info("assetid not none")
-            delete_asset(assetid,session)
         # Create Asset
         create_asset(asset, session, manage_host_ca_filepath)
         # Get Asset id for newly created Asset
@@ -927,8 +924,6 @@ data:
         time.sleep(20)
         # Update newly created Asset
         update_asset(assetid, session, manage_host_ca_filepath)
-        # Delete newly created Asset
-        delete_asset(assetid, session, manage_host_ca_filepath)
         
     def get_asset(asset, session, manage_host_ca_filepath):
         asset_url = f'''{MANAGE_URL}/maximo/api/os/mxapiasset?lean=1&oslc.select=assetnum&oslc.where=assetnum%3D%22{asset}%22'''
@@ -982,6 +977,7 @@ data:
         logger.info(response.text)
         assert_that(response.status_code).is_equal_to(204)
 
+    # This function only works if a dbc has been loaded to allow delete of assets
     def delete_asset(assetid, session, manage_host_ca_filepath):
         asset_url = MANAGE_URL+"/maximo/api/os/mxapiasset/"+assetid
         querystring = {"lean":"1"}