From b9776986e42c502f205a88aef32b93e8cd6fdd0b Mon Sep 17 00:00:00 2001
From: "ya.wang" <wang.ya@99cloud.net>
Date: Wed, 21 Mar 2018 14:29:19 +0800
Subject: [PATCH] Add two params for compose node

  - total_system_core_req
  - total_system_memory_req

Change-Id: Ica453ab4ade429e6c94e7d790feb4c544851b3fc
---
 rsd_lib/resources/v2_1/node/node.py           | 36 +++++++++++++++++--
 rsd_lib/resources/v2_1/node/schemas.py        |  8 +++++
 .../unit/resources/v2_1/node/test_node.py     |  8 +++--
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/rsd_lib/resources/v2_1/node/node.py b/rsd_lib/resources/v2_1/node/node.py
index ba5255d..6ad2c4d 100644
--- a/rsd_lib/resources/v2_1/node/node.py
+++ b/rsd_lib/resources/v2_1/node/node.py
@@ -446,7 +446,9 @@ class NodeCollection(base.ResourceCollectionBase):
     def _create_compose_request(self, name=None, description=None,
                                 processor_req=None, memory_req=None,
                                 remote_drive_req=None, local_drive_req=None,
-                                ethernet_interface_req=None):
+                                ethernet_interface_req=None,
+                                total_system_core_req=None,
+                                total_system_memory_req=None):
 
         request = {}
 
@@ -480,12 +482,23 @@ class NodeCollection(base.ResourceCollectionBase):
                      node_schemas.ethernet_interface_req_schema)
             request['EthernetInterfaces'] = ethernet_interface_req
 
+        if total_system_core_req is not None:
+            validate(total_system_core_req,
+                     node_schemas.total_system_core_req_schema)
+            request['TotalSystemCoreCount'] = total_system_core_req
+
+        if total_system_memory_req is not None:
+            validate(total_system_memory_req,
+                     node_schemas.total_system_memory_req_schema)
+            request['TotalSystemMemoryMiB'] = total_system_memory_req
+
         return request
 
     def compose_node(self, name=None, description=None,
                      processor_req=None, memory_req=None,
                      remote_drive_req=None, local_drive_req=None,
-                     ethernet_interface_req=None):
+                     ethernet_interface_req=None, total_system_core_req=None,
+                     total_system_memory_req=None):
         """Compose a node from RackScale hardware
 
         :param name: Name of node
@@ -495,7 +508,22 @@ class NodeCollection(base.ResourceCollectionBase):
         :param remote_drive_req: JSON for node remote drives
         :param local_drive_req: JSON for node local drives
         :param ethernet_interface_req: JSON for node ethernet ports
+        :param total_system_core_req: Total processor cores available in
+            composed node
+        :param total_system_memory_req: Total memory available in composed node
         :returns: The location of the composed node
+
+        When the 'processor_req' is not none: it need a computer system
+        contains processors whose each processor meet all conditions in the
+        value.
+
+        When the 'total_system_core_req' is not none: it need a computer
+        system contains processors whose cores sum up to number equal or
+        greater than 'total_system_core_req'.
+
+        When both values are not none: it need meet all conditions.
+
+        'memory_req' and 'total_system_memory_req' is the same.
         """
         target_uri = self._get_compose_action_element().target_uri
         properties = self._create_compose_request(
@@ -504,7 +532,9 @@ class NodeCollection(base.ResourceCollectionBase):
             memory_req=memory_req,
             remote_drive_req=remote_drive_req,
             local_drive_req=local_drive_req,
-            ethernet_interface_req=ethernet_interface_req)
+            ethernet_interface_req=ethernet_interface_req,
+            total_system_core_req=total_system_core_req,
+            total_system_memory_req=total_system_memory_req)
         resp = self._conn.post(target_uri, data=properties)
         LOG.info("Node created at %s", resp.headers['Location'])
         node_url = resp.headers['Location']
diff --git a/rsd_lib/resources/v2_1/node/schemas.py b/rsd_lib/resources/v2_1/node/schemas.py
index fddb0a1..29ff20e 100644
--- a/rsd_lib/resources/v2_1/node/schemas.py
+++ b/rsd_lib/resources/v2_1/node/schemas.py
@@ -171,3 +171,11 @@ ethernet_interface_req_schema = {
         'additionalProperties': False,
     }]
 }
+
+total_system_core_req_schema = {
+    'type': 'number'
+}
+
+total_system_memory_req_schema = {
+    'type': 'number'
+}
diff --git a/rsd_lib/tests/unit/resources/v2_1/node/test_node.py b/rsd_lib/tests/unit/resources/v2_1/node/test_node.py
index cb317e2..63fe9ee 100644
--- a/rsd_lib/tests/unit/resources/v2_1/node/test_node.py
+++ b/rsd_lib/tests/unit/resources/v2_1/node/test_node.py
@@ -490,12 +490,16 @@ class NodeCollectionTestCase(testtools.TestCase):
             }],
             'Memory': [{
                 'CapacityMiB': 8000
-            }]
+            }],
+            'TotalSystemCoreCount': 8,
+            'TotalSystemMemoryMiB': 16000
         }
         result = self.node_col.compose_node(
             name='test', description='this is a test node',
             processor_req=[{'TotalCores': 4}],
-            memory_req=[{'CapacityMiB': 8000}])
+            memory_req=[{'CapacityMiB': 8000}],
+            total_system_core_req=8,
+            total_system_memory_req=16000)
         self.node_col._conn.post.assert_called_once_with(
             '/redfish/v1/Nodes/Actions/Allocate', data=reqs)
         self.assertEqual(result, '/redfish/v1/Nodes/1')