test(Case Management): minor fixes to case-mgmt integration test

Author: padamstx

test/integration/test_case_management_v1.py

@@ -13,7 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 '''
  This class contains an integration test for the Case Management service.
 '''
@@ -29,6 +28,7 @@
 # Read config file
 configFile = 'case_management.env'
 
+
 class TestCaseManagementV1(unittest.TestCase):
     """
     Integration Test Class for CaseManagementV1
@@ -39,12 +39,15 @@ class TestCaseManagementV1(unittest.TestCase):
     # Used to store newly uploaded file id
     file_attachment_id = ''
 
+    resource_crn = 'crn:v1:staging:public:cloud-object-storage:global:a/19c52e57800c4d8bb9aefc66b3e49755:61848e72-6ba6-415e-84e2-91f3915e194d::'
+
     @classmethod
     def setUpClass(cls):
         if os.path.exists(configFile):
             os.environ['IBM_CREDENTIALS_FILE'] = configFile
         else:
-            raise unittest.SkipTest('External configuration not available, skipping...')
+            raise unittest.SkipTest(
+                'External configuration not available, skipping...')
 
         cls.service = CaseManagementV1.new_instance()
         assert cls.service is not None
@@ -57,7 +60,8 @@ def test_01_create_case(self):
         offering_payload_type_model = {}
         offering_payload_type_model['group'] = 'crn_service_name'
         offering_payload_type_model['key'] = 'cloud-object-storage'
-        offering_payload_type_model['id'] = 'dff97f5c-bc5e-4455-b470-411c3edbe49c'
+        offering_payload_type_model[
+            'id'] = 'dff97f5c-bc5e-4455-b470-411c3edbe49c'
 
         offering_payload_model = {}
         offering_payload_model['name'] = 'Cloud Object Storage'
@@ -69,14 +73,12 @@ def test_01_create_case(self):
         severity = 4
         offering = offering_payload_model
 
-        response = self.service.create_case(
-            type,
-            subject,
-            description,
-            severity=severity,
-            offering=offering,
-            headers={}
-        )
+        response = self.service.create_case(type,
+                                            subject,
+                                            description,
+                                            severity=severity,
+                                            offering=offering,
+                                            headers={})
 
         # Storing the new case number for subsequent test cases
         TestCaseManagementV1.new_case_number = response.result['number']
@@ -93,13 +95,11 @@ def test_02_create_case_with_empty_offering(self):
         severity = 4
 
         with pytest.raises(ApiException) as e:
-            self.service.create_case(
-                type,
-                subject,
-                description,
-                severity=severity,
-                headers={}
-                )
+            self.service.create_case(type,
+                                     subject,
+                                     description,
+                                     severity=severity,
+                                     headers={})
         assert e.value.code == 400
 
     def test_03_create_case_with_empty_subject_and_description(self):
@@ -108,7 +108,8 @@ def test_03_create_case_with_empty_subject_and_description(self):
         offering_payload_type_model = {}
         offering_payload_type_model['group'] = 'crn_service_name'
         offering_payload_type_model['key'] = 'cloud-object-storage'
-        offering_payload_type_model['id'] = 'dff97f5c-bc5e-4455-b470-411c3edbe49c'
+        offering_payload_type_model[
+            'id'] = 'dff97f5c-bc5e-4455-b470-411c3edbe49c'
 
         offering_payload_model = {}
         offering_payload_model['name'] = 'Cloud Object Storage'
@@ -122,14 +123,12 @@ def test_03_create_case_with_empty_subject_and_description(self):
 
         # Subject and description are required
         with pytest.raises(ApiException) as e:
-            self.service.create_case(
-                type,
-                subject,
-                description,
-                severity=severity,
-                offering=offering,
-                headers={}
-            )
+            self.service.create_case(type,
+                                     subject,
+                                     description,
+                                     severity=severity,
+                                     offering=offering,
+                                     headers={})
         assert e.value.code == 400
 
     def test_04_get_cases(self):
@@ -139,13 +138,11 @@ def test_04_get_cases(self):
         sort = 'number'
         fields = ['number']
 
-        response = self.service.get_cases(
-            offset=offset,
-            limit=limit,
-            sort=sort,
-            fields=fields,
-            headers={}
-        )
+        response = self.service.get_cases(offset=offset,
+                                          limit=limit,
+                                          sort=sort,
+                                          fields=fields,
+                                          headers={})
 
         assert response.status_code == 200
         assert response.result['total_count'] > 0
@@ -155,13 +152,12 @@ def test_05_get_case(self):
         fields = ['number', 'short_description']
         case_number = TestCaseManagementV1.new_case_number
 
-        response = self.service.get_case(
-            self.new_case_number,
-            fields=fields,
-            headers={}
-        )
+        response = self.service.get_case(self.new_case_number,
+                                         fields=fields,
+                                         headers={})
 
-        assert TestCaseManagementV1.new_case_number == response.result['number']
+        assert TestCaseManagementV1.new_case_number == response.result[
+            'number']
         assert response.result['short_description'] != ''
 
     def test_06_get_case_with_invalid_field(self):
@@ -170,23 +166,17 @@ def test_06_get_case_with_invalid_field(self):
         case_number = TestCaseManagementV1.new_case_number
 
         with pytest.raises(ApiException) as e:
-            self.service.get_case(
-                self.new_case_number,
-                fields=fields,
-                headers={}
-            )
+            self.service.get_case(self.new_case_number,
+                                  fields=fields,
+                                  headers={})
         assert e.value.code == 400
 
     def test_07_add_comment(self):
 
         case_number = TestCaseManagementV1.new_case_number
         comment = 'This is a test comment!'
 
-        response = self.service.add_comment(
-            case_number,
-            comment,
-            headers={}
-        )
+        response = self.service.add_comment(case_number, comment, headers={})
 
         assert response.status_code == 200
         assert comment == response.result["value"]
@@ -197,11 +187,7 @@ def test_08_add_comment_to_nonexisting_case(self):
         comment = 'This is a test comment!'
 
         with pytest.raises(ApiException) as e:
-            self.service.add_comment(
-                case_number,
-                comment,
-                headers={}
-            )
+            self.service.add_comment(case_number, comment, headers={})
         assert e.value.code == 404
 
     def test_09_add_watch_list_member(self):
@@ -216,33 +202,32 @@ def test_09_add_watch_list_member(self):
         response = self.service.add_watchlist(
             TestCaseManagementV1.new_case_number,
             watchlist=watchlist,
-            headers={}
-        )
+            headers={})
 
         # Non-account member cannot be added to the watch-list,
         # therefore the response will include a "failed" list
         assert response.status_code == 200
 
         # Loop over all returned users and find the matching one by user id
-        found_users = [user for user in response.result['failed']
-            if user['user_id'] == user_id_and_realm_model['user_id']]
+        found_users = [
+            user for user in response.result['failed']
+            if user['user_id'] == user_id_and_realm_model['user_id']
+        ]
         assert len(found_users) == 1
 
     def test_10_file_upload(self):
 
         fileName = "test_file.txt"
 
         file_with_metadata_model = {}
-        file_with_metadata_model['data'] = io.BytesIO(b'This is a mock file.').getvalue()
+        file_with_metadata_model['data'] = io.BytesIO(
+            b'This is a mock file.').getvalue()
         file_with_metadata_model['filename'] = fileName
 
         file = [file_with_metadata_model]
 
         response = self.service.upload_file(
-            TestCaseManagementV1.new_case_number,
-            file,
-            headers={}
-        )
+            TestCaseManagementV1.new_case_number, file, headers={})
 
         TestCaseManagementV1.file_attachment_id = response.result['id']
 
@@ -254,8 +239,7 @@ def test_11_download_file(self):
         response = self.service.download_file(
             TestCaseManagementV1.new_case_number,
             TestCaseManagementV1.file_attachment_id,
-            headers={}
-        )
+            headers={})
 
         assert response.status_code == 200
         assert 'content-type' in response.headers
@@ -265,32 +249,20 @@ def test_12_delete_file(self):
         response = self.service.delete_file(
             TestCaseManagementV1.new_case_number,
             TestCaseManagementV1.file_attachment_id,
-            headers={}
-        )
+            headers={})
 
         assert response.status_code == 200
         # Assert the file attachment list is empty
         assert len(response.result['attachments']) == 0
 
     def test_13_add_resource(self):
 
-        # Adding a resource requires a valid CRN (Cloud Resource Name)
-        # CRN's can be retrieved via the Search and Tagging API
-        crn = 'invalid:crn'
-        type = 'testString'
-        id = 36.0
-        note = 'testString'
-
-        with pytest.raises(ApiException) as e:
-            response = self.service.add_resource(
-                TestCaseManagementV1.new_case_number,
-                crn=crn,
-                type=type,
-                id=id,
-                note=note,
-                headers={}
-            )
-        assert e.value.code == 500
+        response = self.service.add_resource(
+            TestCaseManagementV1.new_case_number,
+            crn=TestCaseManagementV1.resource_crn,
+            note='Test resource')
+        assert response.status_code == 200
+        assert response is not None
 
     def test_14_resolve_case(self):
 
@@ -300,10 +272,8 @@ def test_14_resolve_case(self):
         status_payload['resolution_code'] = 1
 
         response = self.service.update_case_status(
-            TestCaseManagementV1.new_case_number,
-            status_payload,
-            headers={}
-        )
+            TestCaseManagementV1.new_case_number, status_payload, headers={})
 
         assert response.status_code == 200
-        assert TestCaseManagementV1.new_case_number == response.result["number"]
+        assert TestCaseManagementV1.new_case_number == response.result[
+            "number"]