Merge pull request #300 from zhilong-xu/pure

pure codeview-Remove unnecessary function wrapping

delfin/drivers/pure/pure/pure_storage.py

@@ -21,7 +21,8 @@ def list_volumes(self, context):
         list_volumes = []
         volumes = self.rest_handler.get_volumes()
         if volumes:
-            pools = self.rest_handler.get_pools()
+            pools = self.rest_handler.rest_call(
+                self.rest_handler.REST_POOLS_URL)
             for volume in volumes:
                 volume_name = volume.get('name')
                 total_capacity = int(int(volume.get('size',
@@ -58,7 +59,8 @@ def clear_alert(self, context, alert):
         pass
 
     def get_storage(self, context):
-        storages = self.rest_handler.get_storages()
+        storages = self.rest_handler.rest_call(
+            self.rest_handler.REST_STORAGE_URL)
         model = None
         total_capacity = None
         used_capacity = None
@@ -73,7 +75,7 @@ def get_storage(self, context):
                                     / units.Ki)
                 break
 
-        arrays = self.rest_handler.get_arrays()
+        arrays = self.rest_handler.rest_call(self.rest_handler.REST_ARRAY_URL)
         storage_name = None
         serial_number = None
         version = None
@@ -97,7 +99,7 @@ def get_storage(self, context):
         return storage_result
 
     def list_alerts(self, context, query_para=None):
-        alerts = self.rest_handler.get_alerts()
+        alerts = self.rest_handler.rest_call(self.rest_handler.REST_ALERTS_URL)
         alerts_list = []
         if alerts:
             for alert in alerts:
@@ -122,7 +124,8 @@ def list_alerts(self, context, query_para=None):
 
     def list_controllers(self, context):
         list_controllers = []
-        controllers = self.rest_handler.get_controllers()
+        controllers = self.rest_handler.rest_call(
+            self.rest_handler.REST_CONTROLLERS_URL)
         if controllers:
             for controller in controllers:
                 controllers_dict = dict()
@@ -141,7 +144,8 @@ def list_controllers(self, context):
 
     def list_disks(self, context):
         hardware_dict = dict()
-        hardware = self.rest_handler.get_hardware()
+        hardware = self.rest_handler.rest_call(
+            self.rest_handler.REST_HARDWARE_URL)
         if hardware:
             for hardware_value in hardware:
                 hardware_name = dict()
@@ -152,7 +156,7 @@ def list_disks(self, context):
                 hardware_dict[hardware_value_name] = hardware_name
 
         list_disks = []
-        disks = self.rest_handler.get_disks()
+        disks = self.rest_handler.rest_call(self.rest_handler.REST_DISK_URL)
         if disks:
             for disk in disks:
                 disk_dict = dict()
@@ -185,7 +189,7 @@ def list_disks(self, context):
     def list_ports(self, context):
         networks = self.get_network()
         list_ports = []
-        ports = self.rest_handler.get_ports()
+        ports = self.rest_handler.rest_call(self.rest_handler.REST_PORT_URL)
         if ports:
             for port in ports:
                 port_result = dict()
@@ -215,7 +219,8 @@ def list_ports(self, context):
 
     def get_network(self):
         networks_object = dict()
-        networks = self.rest_handler.get_networks()
+        networks = self.rest_handler.rest_call(
+            self.rest_handler.REST_NETWORK_URL)
         if networks:
             for network in networks:
                 network_dict = dict()
@@ -236,7 +241,8 @@ def get_network(self):
 
     def list_storage_pools(self, context):
         pool_list = []
-        pools = self.rest_handler.get_capacity_pools()
+        pools = self.rest_handler.rest_call(
+            self.rest_handler.REST_POOLS_CAPACITY_URL)
         if pools:
             for pool in pools:
                 pool_result = dict()

delfin/drivers/pure/pure/rest_handler.py

@@ -78,46 +78,6 @@ def logout(self):
                       RestHandler.REST_SESSION_URL, res.text)
             raise exception.StorageBackendException(res.text)
 
-    def get_storages(self):
-        storages = self.rest_call(RestHandler.REST_STORAGE_URL)
-        return storages
-
-    def get_arrays(self):
-        arrays = self.rest_call(RestHandler.REST_ARRAY_URL)
-        return arrays
-
-    def get_pools(self):
-        pools = self.rest_call(RestHandler.REST_POOLS_URL)
-        return pools
-
-    def get_capacity_pools(self):
-        capacity_pools = self.rest_call(RestHandler.REST_POOLS_CAPACITY_URL)
-        return capacity_pools
-
-    def get_ports(self):
-        ports = self.rest_call(RestHandler.REST_PORT_URL)
-        return ports
-
-    def get_networks(self):
-        networks = self.rest_call(RestHandler.REST_NETWORK_URL)
-        return networks
-
-    def get_disks(self):
-        disks = self.rest_call(RestHandler.REST_DISK_URL)
-        return disks
-
-    def get_hardware(self):
-        hardware = self.rest_call(RestHandler.REST_HARDWARE_URL)
-        return hardware
-
-    def get_controllers(self):
-        controllers = self.rest_call(RestHandler.REST_CONTROLLERS_URL)
-        return controllers
-
-    def get_alerts(self):
-        alerts = self.rest_call(RestHandler.REST_ALERTS_URL)
-        return alerts
-
     def rest_call(self, url, data=None, method='GET'):
         result_json = None
         res = self.do_call(url, data, method)

setup.py

@@ -46,7 +46,7 @@
             'hpe 3par = delfin.drivers.hpe.hpe_3par.hpe_3parstor:Hpe3parStorDriver',
             'huawei oceanstor = delfin.drivers.huawei.oceanstor.oceanstor:OceanStorDriver',
             'ibm storwize_svc = delfin.drivers.ibm.storwize_svc.storwize_svc:StorwizeSVCDriver',
-            'netapp cmode = delfin.drivers.netapp.dataontap.cluster_mode:NetAppCmodeDriver'
+            'netapp cmode = delfin.drivers.netapp.dataontap.cluster_mode:NetAppCmodeDriver',
             'pure pure = delfin.drivers.pure.pure.pure_storage:PureStorageDriver'
         ]
     },