Merge pull request #78 from MichaelMcAleer/91/migrate_tool

91/migrate tool

Author: helenwalsh

ChangeLog

@@ -204,8 +204,8 @@ def test_get_headroom(self):
         for i in range(len(headroom_list)):
             self.assertTrue(
                 set({'emulation': 'CKD'}.items()).issubset(
-                    set(headroom_list[i].items())) or
-                set({'emulation': 'FBA'}.items()).issubset(
+                    set(headroom_list[i].items()))
+                or set({'emulation': 'FBA'}.items()).issubset(
                     set(headroom_list[i].items())))
 
     def test_get_iterator_results(self):

PyU4V/tests/ci_tests/test_pyu4v_ci_common.py

@@ -1105,8 +1105,9 @@ def test_get_iscsi_ip_address_and_iqn(self):
             if ip_addresses:
                 self.assertIsInstance(ip_addresses, list)
                 for ip in ip_addresses:
-                    valid_ip = (self.provisioning.check_ipv4(ip) or
-                                self.provisioning.check_ipv6(ip))
+                    valid_ip = (
+                        self.provisioning.check_ipv4(
+                            ip) or self.provisioning.check_ipv6(ip))
                     self.assertIsInstance(ip, str)
                     self.assertTrue(valid_ip)
             if iqn:

PyU4V/tests/ci_tests/test_pyu4v_ci_provisioning.py

@@ -146,8 +146,8 @@ def test_logger_configured(self):
         # Compile regex search pattern for matching the current time (to the
         # minute)
         time_re_search = re.compile(
-            r"\A" + time.strftime("%Y-%m-%d") + r"\s" +
-            time.strftime("%H:%M") + r":\d{2},\d{3}")
+            r"\A" + time.strftime("%Y-%m-%d")
+            + r"\s" + time.strftime("%H:%M") + r":\d{2},\d{3}")
         # Open PyU4V.log file and read the lines withing
         with open(log_path, newline='') as log_file:
             log_lines = log_file.readlines()
@@ -315,8 +315,8 @@ def _my_test_func():
         # Create regex search patterns
         reg_time = r'\A' + c_date + r'\s' + c_time + r':\d{2},\d{3}\s-\s'
         reg_lvl = r'PyU4V\.action\_required\s-\sWARNING\s-\s'
-        reg_msg = (c_name + r'\.' + f_name + r'[\w\s]{31}' + str(end_ver) +
-                   r'\.[\w\s]{46}' + str(start_ver) + r'[\w\s]{14}\.$')
+        reg_msg = (c_name + r'\.' + f_name + r'[\w\s]{31}' + str(end_ver)
+                   + r'\.[\w\s]{46}' + str(start_ver) + r'[\w\s]{14}\.$')
         # Compile regex search query
         time_re_search = re.compile((reg_time + reg_lvl + reg_msg))
         # Run the dummy function to output notice to log file
@@ -359,9 +359,9 @@ def _my_test_func():
         # Create regex search patterns
         reg_time = r'\A' + c_date + r'\s' + c_time + r':\d{2},\d{3}\s-\s'
         reg_lvl = r'PyU4V\.action\_required\s-\sWARNING\s-\s'
-        reg_msg = (c_name + r'\.' + f_name + r'[\w\s]{31}' + str(end_ver) +
-                   r'[\w\s]{23}' + f_path + r'\.[\w\s]{46}' +
-                   str(start_ver) + r'[\w\s]{14}\.$')
+        reg_msg = (c_name + r'\.' + f_name + r'[\w\s]{31}' + str(end_ver)
+                   + r'[\w\s]{23}' + f_path + r'\.[\w\s]{46}'
+                   + str(start_ver) + r'[\w\s]{14}\.$')
         # Compile regex search query
         time_re_search = re.compile((reg_time + reg_lvl + reg_msg))
         # Run the dummy function to output notice to log file

PyU4V/tests/ci_tests/test_pyu4v_ci_utils.py

@@ -444,3 +444,97 @@ class CommonData(object):
     tag_list = {'tag_name': ['CLBCK', 'Payroll']}
 
     tagged_objects = {'array_ids': ['000297600111']}
+
+    # migrate array info
+    m_array = '000197800123'
+    m_portgroup = 'myportgroup'
+    m_initiatorgroup = 'myinitiatorgroup'
+    m_sg_name = 'mystoragegroup'
+    m_host_name = 'myhost'
+
+    # Old masking views
+    smis_mv_1 = 'OS-myhost-No_SLO-I-MV'
+    smis_mv_2 = 'OS-myhost-SRP_1-Diamond-NONE-I-CD-MV'
+    smis_mv_3 = 'OS-myhost-SRP_1-Diamond-DSS-I-MV'
+    smis_mv_4 = 'OS-myhost-SRP_1-Silver-NONE-I-MV'
+    smis_mv_5 = 'OS-myhost-SRP_1-Bronze-OLTP-I-CD-MV'
+    smis_mv_6 = 'OS-myhost-SRP_1-Diamond-OLTP-I-RE-MV'
+    smis_mv_7 = 'OS-host-with-dashes-No_SLO-I-MV'
+    smis_mv_8 = 'OS-host-with-dashes-SRP_1-Diamond-NONE-I-MV'
+
+    # New masking view
+    rest_mv_1 = 'OS-myhost-I-myportgroup-MV'
+    rest_mv_2 = 'OS-myhost-I-portgroup-with-dashes-MV'
+    rest_mv_3 = 'OS-host-with-dash-I-myportgroup-MV'
+
+    # Old storage groups
+    smis_sg_1 = 'OS-myhost-No_SLO-I-SG'
+    smis_sg_2 = 'OS-myhost-SRP_1-Diamond-NONE-I-SG'
+    smis_sg_3 = 'OS-myhost-SRP_1-Diamond-DSS-I-SG'
+    smis_sg_4 = 'OS-myhost-SRP_1-Silver-NONE-I-CD-SG'
+    smis_sg_5 = 'OS-myhost-SRP_1-Diamond-OLTP-I-CD-SG'
+    smis_sg_6 = 'OS-myhost-SRP_1-Bronze-OLTP-I-RE-SG'
+    smis_sg_7 = 'OS-host-with_dashes-SRP_1-Diamond-OLTP-I-RE-SG'
+    smis_sg_8 = 'OS-myhost-SRP_1-Diamond-NONE-I-CD-SG'
+
+    # New parent storage groups
+    rest_parent_sg = 'OS-myhost-I-myportgroup-SG'
+
+    # New storage groups
+    rest_sg_1 = 'OS-myhost-No_SLO-os-iscsi-pg'
+    rest_sg_2 = 'OS-myhost-SRP_1-DiamodNONE-os-iscsi-pg-CD'
+    rest_sg_3 = 'OS-myhost-SRP_1-DiamodNONE-os-iscsi-pg'
+    rest_sg_4 = 'OS-myhost-SRP_1-DiamodOLTP-os-iscsi-pg-RE'
+    rest_sg_5 = 'OS-host-with-dashes-SRP_1-DiamodOLTP-myportgroup-RE'
+    rest_sg_6 = 'OS-myhost-SRP_1-DiamodOLTP-myportgroup-CD'
+
+    m_storagegroup = {'slo': 'Diamond',
+                      'workload': 'OLTP',
+                      'storageGroupId': 'test'}
+
+    m_maskingview = {'portGroupId': m_portgroup,
+                     'hostId': m_host_name,
+                     'storageGroupId': rest_parent_sg,
+                     'maskingViewId': rest_mv_1}
+
+    element_dict = {'new_mv_name': 'OS-myhost-I-myportgroup-MV',
+                    'workload': 'NONE',
+                    'new_sg_name': 'OS-myhost-SRP_1-DiamodNONE-myportgroup',
+                    'srp': 'SRP_1', 'port_group': 'myportgroup',
+                    'initiator_group': 'myinitiatorgroup',
+                    'new_sg_parent_name': 'OS-myhost-I-myportgroup-SG',
+                    'service_level': 'Diamond'}
+
+    element_dict_revert = {
+        'service_level': 'Diamond',
+        'port_group': 'myportgroup',
+        'initiator_group': 'myinitiatorgroup',
+        'srp': 'SRP_1',
+        'new_mv_name': 'OS-myhost-SRP_1-Diamond-NONE-I-CD-MV',
+        'new_sg_name': 'OS-myhost-SRP_1-Diamond-NONE-I-CD-SG',
+        'workload': 'NONE'}
+
+    mv_components = {'portGroupId': m_portgroup,
+                     'hostId': m_host_name,
+                     'storageGroupId': rest_sg_1,
+                     'maskingViewId': rest_mv_1}
+
+    device_list = ['0064F', '0088E', '00890', '00891', '00DF2', '00DF3']
+
+    host_io_limit_source = {'host_io_limit_mb_sec': '2000',
+                            'host_io_limit_io_sec': '2000',
+                            'dynamicDistribution': 'Always'}
+
+    host_io_limit_target = {'host_io_limit_mb_sec': '4000',
+                            'host_io_limit_io_sec': '4000',
+                            'dynamicDistribution': 'Never'}
+
+    source_sg_details = {'storageGroupId': smis_sg_2,
+                         'slo': 'Diamond',
+                         'srp': 'SRP_1',
+                         'hostIOLimit': host_io_limit_source}
+
+    target_sg_details = {'storageGroupId': rest_sg_3,
+                         'slo': 'Diamond',
+                         'srp': 'SRP_1',
+                         'hostIOLimit': host_io_limit_target}