Merge pull request #109 from mgazz/fix-composed

Improve handling of composition requests

Author: mraineri

Diff for: api_emulator/redfish/ComputerSystem_api.py

@@ -72,15 +72,16 @@ def get(self, ident):
         logging.info('ComputerSystemAPI GET called')
         try:
             # Find the entry with the correct value for Id
-            resp = 404
             if ident in members:
                 conf= members[ident]
                 conf['ProcessorSummary']=self.processor_summary(ident)
                 conf['MemorySummary']=self.memory_summary(ident)
                 resp = conf, 200
+            else:
+                resp = "System " + ident + " not found" , 404
         except Exception:
             traceback.print_exc()
-            resp = INTERNAL_ERROR
+            resp = "Internal Server Error", INTERNAL_ERROR
         return resp
 
     # HTTP PUT
@@ -127,19 +128,20 @@ def patch(self, ident):
     def delete(self, ident):
         logging.info('ComputerSystemAPI DELETE called')
         try:
-            resp = 404
             if ident in members:
-                if members[ident]['SystemType'] == 'Composed':
+                if 'SystemType' in members[ident] and members[ident]['SystemType'] == 'Composed':
                     # Delete a composed system
                     resp = DeleteComposedSystem(ident)
                     resp = 200
                 else:
                     # Delete a physical system
                     del(members[ident])
                     resp = 200
+            else:
+                resp = "System " + ident + " not found", 404
         except Exception:
             traceback.print_exc()
-            resp = INTERNAL_ERROR
+            resp = "Internal Server Error", INTERNAL_ERROR
         return resp
 
 
@@ -180,6 +182,12 @@ def put(self):
 
     def verify(self, config):
         #TODO: Implement a method to verify that the POST body is valid
+        if 'Id' not in config:
+            return False, "Missing attribute: Id"
+        if 'Links' not in config:
+            return False, "Missing attribute: Links"
+        if 'ResourceBlocks' not in config['Links']:
+            return False, "Missing array: Links['ResourceBlocks']"
         return True,{}
 
     # HTTP POST
@@ -193,13 +201,15 @@ def post(self):
             config = request.get_json(force=True)
             ok, msg = self.verify(config)
             if ok:
+                config["@odata.id"]= "/redfish/v1/Systems/"+ config['Id']
                 members[config['Id']] = config
                 resp = config, 201
             else:
                 resp = msg, 400
         except Exception:
             traceback.print_exc()
-            resp = INTERNAL_ERROR
+            resp = "Internal Server Error", INTERNAL_ERROR
+
         return resp
 
         '''

Diff for: test-composed-with-id.json

@@ -0,0 +1,14 @@
+{
+  "Id":"Composed-1",
+  "Name": "Composed Computer System",
+  "Links": {
+    "ResourceBlocks": [
+      {
+        "@odata.id": "/redfish/v1/CompositionService/ResourceBlocks/Block-1"
+      },
+      {
+        "@odata.id": "/redfish/v1/CompositionService/ResourceBlocks/Block-2"
+      }
+    ]
+  }
+}

Diff for: unittests.py

@@ -133,15 +133,50 @@ def test_redfish_get_system(self):
 
         self.do_gets(params, logger)
 
+    def test_redfish_create_system_status_codes(self):
+        """
+        Unit test to get resource of a system instance
+
+        NOTE: The emulator must be in the redfish mode to run this test
+        """
+        self.log_file = 'test-create-system-status-codes.log'
+        logger = self.get_logger(
+            'test-create-system-status-codes',
+            self.log_file)
+
         with open('test-composed.json') as payload:
             headers = {'Content-Type': 'application/json'}
             r = requests.post(self.url('Systems'), data=payload, headers=headers)
-            self.do_gets([(self.url('Systems/Composed-1'), 'ComposedSystem member')], logger)
+            self.assert_status(r, 400, logger)
+
+        r = requests.get(self.url('Systems/Composed-1'))
+        self.assert_status(r, 404, logger)
 
         # Testing deleting the system instance (expect to fail with 404)
+        r = requests.delete(self.url('Systems/Composed-1'))
+        self.assert_status(r, 404, logger)
+
+    def test_redfish_create_system(self):
+        """
+        Unit test to get resource of a system instance
+
+        NOTE: The emulator must be in the redfish mode to run this test
+        """
+        self.log_file = 'test-create-system-status-codes.log'
+        logger = self.get_logger(
+            'test-create-system-status-codes',
+            self.log_file)
+
+        with open('test-composed-with-id.json') as payload:
+            headers = {'Content-Type': 'application/json'}
+            r = requests.post(self.url('Systems'), data=payload, headers=headers)
+            self.assert_status(r, 201, logger)
+
+        r = requests.get(self.url('Systems/Composed-1'))
+        self.assert_status(r, 200, logger)
+
         r = requests.delete(self.url('Systems/Composed-1'))
         self.assert_status(r, 200, logger)
-	    #logger.info('PASS: Unable to delete system instance')
 
 if __name__ == '__main__':
     #main(sys.argv[2:])