Rename metrcis to ethernet_switch_metrics in RSD 2.2

Change-Id: Id2dd6b0aa3b3beacdf646b3a86283e5acc2847c8

rsd_lib/resources/v2_2/ethernet_switch/ethernet_switch.py

@@ -15,8 +15,8 @@
 
 from rsd_lib.resources.v2_1.ethernet_switch import ethernet_switch \
     as v2_1_ethernet_switch
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch_metrics
 from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch_port
-from rsd_lib.resources.v2_2.ethernet_switch import metrics
 
 from sushy.resources import base
 from sushy import utils
@@ -44,12 +44,12 @@ class EthernetSwitch(v2_1_ethernet_switch.EthernetSwitch):
     @property
     @utils.cache_it
     def metrics(self):
-        """Property to provide reference to `Metrics` instance
+        """Property to provide reference to `EthernetSwitchMetrics` instance
 
         It is calculated once when it is queried for the first time. On
         refresh, this property is reset.
         """
-        return metrics.Metrics(
+        return ethernet_switch_metrics.EthernetSwitchMetrics(
             self._conn,
             self._get_metrics_path(),
             redfish_version=self.redfish_version,

rsd_lib/resources/v2_2/ethernet_switch/ethernet_switch_metrics.py

@@ -15,16 +15,15 @@
 
 from sushy.resources import base
 
+from rsd_lib import base as rsd_lib_base
 
-class Metrics(base.ResourceBase):
-    name = base.Field("Name")
-    """The metrics name"""
 
-    description = base.Field("Description")
-    """The description of metrics"""
+class EthernetSwitchMetrics(rsd_lib_base.ResourceBase):
+    """EthernetSwitchMetrics resource class
 
-    identity = base.Field("Id")
-    """The id of metrics"""
+       EthernetSwitchMetrics contains usage and health statistics of an
+       Ethernet Switch .
+    """
 
     health = base.Field("Health")
-    """The health status of metrics"""
+    """Health of Ethernet Switch as a discrete sensor reading"""

rsd_lib/tests/unit/resources/v2_2/ethernet_switch/test_ethernet_switch.py

@@ -17,8 +17,8 @@ import json
 import mock
 
 from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch_metrics
 from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch_port
-from rsd_lib.resources.v2_2.ethernet_switch import metrics
 
 import testtools
 
@@ -110,7 +110,9 @@ class EthernetSwitchTestCase(testtools.TestCase):
         # | WHEN |
         actual_metrics = self.ethernet_switch_inst.metrics
         # | THEN |
-        self.assertIsInstance(actual_metrics, metrics.Metrics)
+        self.assertIsInstance(
+            actual_metrics, ethernet_switch_metrics.EthernetSwitchMetrics
+        )
         self.conn.get.return_value.json.assert_called_once_with()
 
         # reset mock
@@ -130,7 +132,8 @@ class EthernetSwitchTestCase(testtools.TestCase):
             self.conn.get.return_value.json.return_value = json.loads(f.read())
         # | WHEN & THEN |
         self.assertIsInstance(
-            self.ethernet_switch_inst.metrics, metrics.Metrics
+            self.ethernet_switch_inst.metrics,
+            ethernet_switch_metrics.EthernetSwitchMetrics,
         )
 
         # On refreshing the metrics instance...
@@ -151,7 +154,8 @@ class EthernetSwitchTestCase(testtools.TestCase):
             self.conn.get.return_value.json.return_value = json.loads(f.read())
         # | WHEN & THEN |
         self.assertIsInstance(
-            self.ethernet_switch_inst.metrics, metrics.Metrics
+            self.ethernet_switch_inst.metrics,
+            ethernet_switch_metrics.EthernetSwitchMetrics,
         )
 
 

rsd_lib/tests/unit/resources/v2_2/ethernet_switch/test_ethernet_switch_metrics.py

@@ -17,30 +17,33 @@ import json
 import mock
 import testtools
 
-from rsd_lib.resources.v2_2.ethernet_switch import metrics
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch_metrics
 
 
 class MetricsTestCase(testtools.TestCase):
-
     def setUp(self):
         super(MetricsTestCase, self).setUp()
         self.conn = mock.Mock()
         with open(
-                'rsd_lib/tests/unit/json_samples/v2_2/'
-                'ethernet_switch_metrics.json',
-                'r') as f:
+            "rsd_lib/tests/unit/json_samples/v2_2/"
+            "ethernet_switch_metrics.json",
+            "r",
+        ) as f:
             self.conn.get.return_value.json.return_value = json.loads(f.read())
 
-        self.metrics_inst = metrics.Metrics(self.conn,
-                                            '/redfish/v1/EthernetSwitches/'
-                                            'Switch1/Metrics',
-                                            redfish_version='1.0.2')
+        self.metrics_inst = ethernet_switch_metrics.EthernetSwitchMetrics(
+            self.conn,
+            "/redfish/v1/EthernetSwitches/" "Switch1/Metrics",
+            redfish_version="1.0.2",
+        )
 
     def test__parse_attributes(self):
         self.metrics_inst._parse_attributes()
-        self.assertEqual('EthernetSwitch Metrics for Switch1',
-                         self.metrics_inst.name)
-        self.assertEqual('description-as-string',
-                         self.metrics_inst.description)
-        self.assertEqual('Metrics for Switch1', self.metrics_inst.identity)
-        self.assertEqual('OK', self.metrics_inst.health)
+        self.assertEqual(
+            "EthernetSwitch Metrics for Switch1", self.metrics_inst.name
+        )
+        self.assertEqual(
+            "description-as-string", self.metrics_inst.description
+        )
+        self.assertEqual("Metrics for Switch1", self.metrics_inst.identity)
+        self.assertEqual("OK", self.metrics_inst.health)