move modules from gen1 to common package (#52)

- service_template
  - managed_device
  - deployment
  - firmware_repository

Author: taohe1012

PyPowerFlex/__init__.py

@@ -128,6 +128,10 @@ def add_objects_common(self):
         self.__add_storage_entity('sdt', common.Sdt)
         self.__add_storage_entity('host', common.Host)
         self.__add_storage_entity('utility', common.PowerFlexUtility)
+        self.__add_storage_entity('service_template', common.ServiceTemplate)
+        self.__add_storage_entity('managed_device', common.ManagedDevice)
+        self.__add_storage_entity('deployment', common.Deployment)
+        self.__add_storage_entity('firmware_repository', common.FirmwareRepository)
 
     def add_objects_gen1(self):
         """Add gen1 objects here."""
@@ -148,12 +152,6 @@ def add_objects_gen1(self):
             'replication_consistency_group',
             gen1.ReplicationConsistencyGroup)
         self.__add_storage_entity('replication_pair', gen1.ReplicationPair)
-        self.__add_storage_entity('service_template', gen1.ServiceTemplate)
-        self.__add_storage_entity('managed_device', gen1.ManagedDevice)
-        self.__add_storage_entity('deployment', gen1.Deployment)
-        self.__add_storage_entity(
-            'firmware_repository',
-            gen1.FirmwareRepository)
 
     def add_objects_gen2(self):
         """Add gen2 objects here."""

PyPowerFlex/objects/common/__init__.py

@@ -20,11 +20,19 @@
 from PyPowerFlex.objects.common.sdc import Sdc
 from PyPowerFlex.objects.common.sdt import Sdt
 from PyPowerFlex.objects.common.utility import PowerFlexUtility
+from PyPowerFlex.objects.common.service_template import ServiceTemplate
+from PyPowerFlex.objects.common.managed_device import ManagedDevice
+from PyPowerFlex.objects.common.deployment import Deployment
+from PyPowerFlex.objects.common.firmware_repository import FirmwareRepository
 
 __all__ = [
     'Sdc',
     'Sdt',
     'System',
     'Host',
     'PowerFlexUtility',
+    'ServiceTemplate',
+    'ManagedDevice',
+    'Deployment',
+    'FirmwareRepository',
 ]

PyPowerFlex/objects/gen1/deployment.py PyPowerFlex/objects/common/deployment.pyPyPowerFlex/objects/gen1/deployment.py renamed to PyPowerFlex/objects/common/deployment.py

@@ -26,10 +26,6 @@
 from PyPowerFlex.objects.gen1.volume import Volume
 from PyPowerFlex.objects.gen1.replication_consistency_group import ReplicationConsistencyGroup
 from PyPowerFlex.objects.gen1.replication_pair import ReplicationPair
-from PyPowerFlex.objects.gen1.service_template import ServiceTemplate
-from PyPowerFlex.objects.gen1.managed_device import ManagedDevice
-from PyPowerFlex.objects.gen1.deployment import Deployment
-from PyPowerFlex.objects.gen1.firmware_repository import FirmwareRepository
 
 
 __all__ = [
@@ -44,8 +40,4 @@
     'Volume',
     'ReplicationConsistencyGroup',
     'ReplicationPair',
-    'ServiceTemplate',
-    'ManagedDevice',
-    'Deployment',
-    'FirmwareRepository',
 ]