Enable new ethernet switch class in RSD 2.2/2.3

Change-Id: I38e1bb48dd93118421cef9c4d0c99beb80fc0eb3

rsd_lib/resources/v2_2/__init__.py

@@ -16,6 +16,7 @@
 from sushy.resources import base
 
 from rsd_lib.resources import v2_1
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch
 from rsd_lib.resources.v2_2.node import node
 from rsd_lib.resources.v2_2.system import system
 from rsd_lib.resources.v2_2.telemetry import telemetry
@@ -76,3 +77,27 @@ class RSDLibV2_2(v2_1.RSDLibV2_1):
         """
         return telemetry.Telemetry(self._conn, self._telemetry_service_path,
                                    redfish_version=self.redfish_version)
+
+    def get_ethernet_switch_collection(self):
+        """Get the EthernetSwitchCollection object
+
+        :raises: MissingAttributeError, if the collection attribute is
+            not found
+        :returns: a EthernetSwitchCollection object
+        """
+        return ethernet_switch.EthernetSwitchCollection(
+            self._conn,
+            self._ethernet_switches_path,
+            redfish_version=self.redfish_version
+        )
+
+    def get_ethernet_switch(self, identity):
+        """Given the identity return a EthernetSwitch object
+
+        :param identity: The identity of the EthernetSwitch resource
+        :returns: The EthernetSwitch object
+        """
+        return ethernet_switch.EthernetSwitch(
+            self._conn,
+            identity,
+            redfish_version=self.redfish_version)

rsd_lib/tests/unit/resources/v2_2/test_rsdlib_v2_2.py

@@ -18,14 +18,14 @@ import mock
 import testtools
 
 from rsd_lib.resources.v2_1.chassis import chassis as v2_1_chassis
-from rsd_lib.resources.v2_1.ethernet_switch import ethernet_switch \
-    as v2_1_ethernet_switch
 from rsd_lib.resources.v2_1.fabric import fabric as v2_1_fabric
 from rsd_lib.resources.v2_1.manager import manager as v2_1_manager
 from rsd_lib.resources.v2_1.node import node as v2_1_node
 from rsd_lib.resources.v2_1.storage_service import storage_service \
     as v2_1_storage_service
 from rsd_lib.resources import v2_2
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch \
+    as v2_2_ethernet_switch
 from rsd_lib.resources.v2_2.node import node as v2_2_node
 from rsd_lib.resources.v2_2.system import system as v2_2_system
 from rsd_lib.resources.v2_2.telemetry import telemetry as v2_2_telemetry
@@ -147,7 +147,7 @@ class RSDLibV2_2TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/TelemetryService',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_ethernet_switch,
+    @mock.patch.object(v2_2_ethernet_switch,
                        'EthernetSwitchCollection',
                        autospec=True)
     def test_get_ethernet_switch_collection(self,
@@ -157,7 +157,7 @@ class RSDLibV2_2TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/EthernetSwitches',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_ethernet_switch, 'EthernetSwitch', autospec=True)
+    @mock.patch.object(v2_2_ethernet_switch, 'EthernetSwitch', autospec=True)
     def test_get_ethernet_switch(self, mock_ethernet_switch_service):
         self.rsd.get_ethernet_switch('fake-ethernet-switch-id')
         mock_ethernet_switch_service.assert_called_once_with(

rsd_lib/tests/unit/resources/v2_3/test_rsdlib_v2_3.py

@@ -18,9 +18,9 @@ import mock
 import testtools
 
 from rsd_lib.resources.v2_1.chassis import chassis as v2_1_chassis
-from rsd_lib.resources.v2_1.ethernet_switch import ethernet_switch \
-    as v2_1_ethernet_switch
 from rsd_lib.resources.v2_1.manager import manager as v2_1_manager
+from rsd_lib.resources.v2_2.ethernet_switch import ethernet_switch \
+    as v2_2_ethernet_switch
 from rsd_lib.resources.v2_2.system import system as v2_2_system
 from rsd_lib.resources import v2_3
 from rsd_lib.resources.v2_3.fabric import fabric as v2_3_fabric
@@ -137,7 +137,7 @@ class RSDLibV2_3TestCase(testtools.TestCase):
             redfish_version=self.rsd.redfish_version
         )
 
-    @mock.patch.object(v2_1_ethernet_switch,
+    @mock.patch.object(v2_2_ethernet_switch,
                        'EthernetSwitchCollection',
                        autospec=True)
     def test_get_ethernet_switch_collection(self,
@@ -147,7 +147,7 @@ class RSDLibV2_3TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/EthernetSwitches',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_ethernet_switch, 'EthernetSwitch', autospec=True)
+    @mock.patch.object(v2_2_ethernet_switch, 'EthernetSwitch', autospec=True)
     def test_get_ethernet_switch(self, mock_ethernet_switch_service):
         self.rsd.get_ethernet_switch('fake-ethernet-switch-id')
         mock_ethernet_switch_service.assert_called_once_with(