Removed lazy loading of the resources upgraded in version 5.0.0

hpOneView/oneview_client.py

@@ -356,9 +356,7 @@ def fcoe_networks(self):
         Returns:
             FcoeNetworks:
         """
-        if not self.__fcoe_networks:
-            self.__fcoe_networks = FcoeNetworks(self.__connection)
-        return self.__fcoe_networks
+        return FcoeNetworks(self.__connection)
 
     @property
     def ethernet_networks(self):
@@ -438,9 +436,7 @@ def server_hardware(self):
         Returns:
             ServerHardware:
         """
-        if not self.__server_hardware:
-            self.__server_hardware = ServerHardware(self.__connection)
-        return self.__server_hardware
+        return ServerHardware(self.__connection)
 
     @property
     def server_hardware_types(self):
@@ -450,10 +446,7 @@ def server_hardware_types(self):
         Returns:
             ServerHardwareTypes:
         """
-        if not self.__server_hardware_types:
-            self.__server_hardware_types = ServerHardwareTypes(
-                self.__connection)
-        return self.__server_hardware_types
+        return ServerHardwareTypes(self.__connection)
 
     @property
     def id_pools_vsn_ranges(self):
@@ -559,9 +552,7 @@ def switch_types(self):
         Returns:
             SwitchTypes:
         """
-        if not self.__switch_types:
-            self.__switch_types = SwitchTypes(self.__connection)
-        return self.__switch_types
+        return SwitchTypes(self.__connection)
 
     @property
     def logical_switch_groups(self):
@@ -605,9 +596,7 @@ def enclosure_groups(self):
         Returns:
             EnclosureGroups:
         """
-        if not self.__enclosure_groups:
-            self.__enclosure_groups = EnclosureGroups(self.__connection)
-        return self.__enclosure_groups
+        return EnclosureGroups(self.__connection)
 
     @property
     def enclosures(self):
@@ -627,9 +616,7 @@ def logical_enclosures(self):
         Returns:
             LogicalEnclosures:
         """
-        if not self.__logical_enclosures:
-            self.__logical_enclosures = LogicalEnclosures(self.__connection)
-        return self.__logical_enclosures
+        return LogicalEnclosures(self.__connection)
 
     @property
     def metric_streaming(self):
@@ -685,9 +672,7 @@ def sas_interconnect_types(self):
         Returns:
             SasInterconnectTypes:
         """
-        if not self.__sas_interconnect_types:
-            self.__sas_interconnect_types = SasInterconnectTypes(self.__connection)
-        return self.__sas_interconnect_types
+        return SasInterconnectTypes(self.__connection)
 
     @property
     def internal_link_sets(self):
@@ -697,9 +682,7 @@ def internal_link_sets(self):
         Returns:
             InternalLinkSets:
         """
-        if not self.__internal_link_sets:
-            self.__internal_link_sets = InternalLinkSets(self.__connection)
-        return self.__internal_link_sets
+        return InternalLinkSets(self.__connection)
 
     @property
     def logical_interconnect_groups(self):
@@ -709,10 +692,7 @@ def logical_interconnect_groups(self):
         Returns:
             LogicalInterconnectGroups:
         """
-        if not self.__logical_interconnect_groups:
-            self.__logical_interconnect_groups = LogicalInterconnectGroups(
-                self.__connection)
-        return self.__logical_interconnect_groups
+        return LogicalInterconnectGroups(self.__connection)
 
     @property
     def logical_interconnects(self):
@@ -943,9 +923,7 @@ def managed_sans(self):
         Returns:
             ManagedSANs:
         """
-        if not self.__managed_sans:
-            self.__managed_sans = ManagedSANs(self.__connection)
-        return self.__managed_sans
+        return ManagedSANs(self.__connection)
 
     @property
     def migratable_vc_domains(self):
@@ -967,9 +945,7 @@ def sas_interconnects(self):
         Returns:
             SasInterconnects:
         """
-        if not self.__sas_interconnects:
-            self.__sas_interconnects = SasInterconnects(self.__connection)
-        return self.__sas_interconnects
+        return SasInterconnects(self.__connection)
 
     @property
     def sas_logical_interconnect_groups(self):
@@ -979,9 +955,7 @@ def sas_logical_interconnect_groups(self):
         Returns:
             SasLogicalInterconnectGroups:
         """
-        if not self.__sas_logical_interconnect_groups:
-            self.__sas_logical_interconnect_groups = SasLogicalInterconnectGroups(self.__connection)
-        return self.__sas_logical_interconnect_groups
+        return SasLogicalInterconnectGroups(self.__connection)
 
     @property
     def drive_enclosures(self):

tests/unit/test_oneview_client.py

@@ -400,19 +400,18 @@ def test_fcoe_networks_has_right_type(self):
     def test_fcoe_networks_has_value(self):
         self.assertIsNotNone(self._oneview.fcoe_networks)
 
-    def test_lazy_loading_fcoe_networks(self):
-        fcn = self._oneview.fcoe_networks
-        self.assertEqual(fcn, self._oneview.fcoe_networks)
+    def test_should_return_new_fcoe_networks_obj(self):
+        self.assertNotEqual(self._oneview.fcoe_networks, self._oneview.fcoe_networks)
 
     def test_metric_streaming_has_right_type(self):
         self.assertIsInstance(self._oneview.metric_streaming, MetricStreaming)
 
     def test_metric_streaming_has_value(self):
         self.assertIsNotNone(self._oneview.metric_streaming)
 
-    def test_lazy_loading_enclosure_groups(self):
-        enclosure_groups = self._oneview.enclosure_groups
-        self.assertEqual(enclosure_groups, self._oneview.enclosure_groups)
+    def test_should_return_new_enclosure_groups_obj(self):
+        self.assertNotEqual(self._oneview.enclosure_groups,
+                            self._oneview.enclosure_groups)
 
     def test_lazy_loading_tasks(self):
         tasks = self._oneview.tasks
@@ -421,9 +420,8 @@ def test_lazy_loading_tasks(self):
     def test_should_return_new_connection_templates_obj(self):
         self.assertNotEqual(self._oneview.connection_templates, self._oneview.connection_templates)
 
-    def test_lazy_loading_switch_types(self):
-        switch_types = self._oneview.switch_types
-        self.assertEqual(switch_types, self._oneview.switch_types)
+    def test_should_return_new_switch_types_obj(self):
+        self.assertNotEqual(self._oneview.switch_types, self._oneview.switch_types)
 
     def test_lazy_loading_network_sets(self):
         network_sets = self._oneview.network_sets
@@ -444,9 +442,8 @@ def test_lazy_loading_switches(self):
     def test_should_return_new_ethernet_networks_obj(self):
         self.assertNotEqual(self._oneview.ethernet_networks, self._oneview.ethernet_networks)
 
-    def test_lazy_loading_server_hardware(self):
-        server_hardware = self._oneview.server_hardware
-        self.assertEqual(server_hardware, self._oneview.server_hardware)
+    def test_should_return_new_server_hardware_obj(self):
+        self.assertNotEqual(self._oneview.server_hardware, self._oneview.server_hardware)
 
     def test_interconnect_link_topologies_has_right_type(self):
         self.assertIsInstance(self._oneview.interconnect_link_topologies, InterconnectLinkTopologies)
@@ -461,9 +458,9 @@ def test_lazy_loading_interconnect_link_topologies(self):
     def test_sas_interconnect_types_has_right_type(self):
         self.assertIsInstance(self._oneview.sas_interconnect_types, SasInterconnectTypes)
 
-    def test_lazy_loading_sas_interconnect_types(self):
-        sas_interconnect_types = self._oneview.sas_interconnect_types
-        self.assertEqual(sas_interconnect_types, self._oneview.sas_interconnect_types)
+    def test_should_return_new_sas_interconnect_types_obj(self):
+        self.assertNotEqual(self._oneview.sas_interconnect_types,
+                            self._oneview.sas_interconnect_types)
 
     def test_interconnects_has_right_type(self):
         self.assertIsInstance(self._oneview.interconnects, Interconnects)
@@ -489,9 +486,8 @@ def test_lazy_loading_connections(self):
         connections = self._oneview.connections
         self.assertEqual(connections, self._oneview.connections)
 
-    def test_lazy_loading_server_hardware_types(self):
-        server_hardware_types = self._oneview.server_hardware_types
-        self.assertEqual(server_hardware_types, self._oneview.server_hardware_types)
+    def test_should_return_newserver_hardware_types_obj(self):
+        self.assertNotEqual(self._oneview.server_hardware_types, self._oneview.server_hardware_types)
 
     def test_lazy_loading_id_pools_vsn_ranges(self):
         id_pools_vsn_ranges = self._oneview.id_pools_vsn_ranges
@@ -544,9 +540,9 @@ def test_id_pools_lazy_loading(self):
         id_pools = self._oneview.id_pools
         self.assertEqual(id_pools, self._oneview.id_pools)
 
-    def test_lazy_loading_logical_enclosures(self):
-        logical_enclosures = self._oneview.logical_enclosures
-        self.assertEqual(logical_enclosures, self._oneview.logical_enclosures)
+    def test_should_return_new_logical_enclosures_obj(self):
+        self.assertNotEqual(self._oneview.logical_enclosures,
+                            self._oneview.logical_enclosures)
 
     def test_should_return_new_interconnect_types_obj(self):
         self.assertNotEqual(self._oneview.interconnect_types, self._oneview.interconnect_types)
@@ -631,9 +627,9 @@ def test_logical_interconnect_groups_has_right_type(self):
     def test_logical_interconnect_groups_has_value(self):
         self.assertIsNotNone(self._oneview.logical_interconnect_groups)
 
-    def test_lazy_loading_logical_interconnect_groups(self):
-        logical_interconnect_groups = self._oneview.logical_interconnect_groups
-        self.assertEqual(logical_interconnect_groups, self._oneview.logical_interconnect_groups)
+    def test_should_return_new_logical_interconnect_groups_obj(self):
+        self.assertNotEqual(self._oneview.logical_interconnect_groups,
+                            self._oneview.logical_interconnect_groups)
 
     def test_logical_switch_groups_has_right_type(self):
         self.assertIsInstance(self._oneview.logical_switch_groups, LogicalSwitchGroups)
@@ -722,9 +718,8 @@ def test_lazy_loading_scopes(self):
     def test_sas_logical_interconnect_groups_has_right_type(self):
         self.assertIsInstance(self._oneview.sas_logical_interconnect_groups, SasLogicalInterconnectGroups)
 
-    def test_lazy_loading_sas_logical_interconnect_groups(self):
-        sas_logical_interconnect_groups = self._oneview.sas_logical_interconnect_groups
-        self.assertEqual(sas_logical_interconnect_groups, self._oneview.sas_logical_interconnect_groups)
+    def test_should_return_new_sas_logical_interconnect_groups_obj(self):
+        self.assertNotEqual(self._oneview.sas_logical_interconnect_groups, self._oneview.sas_logical_interconnect_groups)
 
     def test_login_details_has_right_type(self):
         self.assertIsInstance(self._oneview.login_details, LoginDetails)
@@ -786,16 +781,15 @@ def test_lazy_loading_datacenters(self):
     def test_managed_sans_has_right_type(self):
         self.assertIsInstance(self._oneview.managed_sans, ManagedSANs)
 
-    def test_lazy_loading_managed_sans(self):
-        managed_sans = self._oneview.managed_sans
-        self.assertEqual(managed_sans, self._oneview.managed_sans)
+    def test_should_return_new_managed_sans_obj(self):
+        self.assertNotEqual(self._oneview.managed_sans, self._oneview.managed_sans)
 
     def test_sas_interconnects_has_right_type(self):
         self.assertIsInstance(self._oneview.sas_interconnects, SasInterconnects)
 
-    def test_lazy_loading_sas_interconnects(self):
-        sas_interconnects = self._oneview.sas_interconnects
-        self.assertEqual(sas_interconnects, self._oneview.sas_interconnects)
+    def test_should_return_new_sas_interconnects_obj(self):
+        self.assertNotEqual(self._oneview.sas_interconnects,
+                            self._oneview.sas_interconnects)
 
     def test_drive_enclosure_has_right_type(self):
         self.assertIsInstance(self._oneview.drive_enclosures, DriveEnclosures)
@@ -814,9 +808,8 @@ def test_lazy_loading_sas_logical_jbods(self):
     def test_internal_link_sets_has_right_type(self):
         self.assertIsInstance(self._oneview.internal_link_sets, InternalLinkSets)
 
-    def test_lazy_loading_internal_link_sets(self):
-        internal_links = self._oneview.internal_link_sets
-        self.assertEqual(internal_links, self._oneview.internal_link_sets)
+    def test_should_return_new_internal_link_sets_obj(self):
+        self.assertNotEqual(self._oneview.internal_link_sets, self._oneview.internal_link_sets)
 
     def test_index_resources_has_right_type(self):
         self.assertIsInstance(self._oneview.index_resources, IndexResources)