Set the eol version.

Huawei · Jul 18, 2020 · 66066e7 · 66066e7
1 parent eca886f
commit 66066e7
Show file tree

Hide file tree

Showing 104 changed files with 1 addition and 4 deletions.
diff --git a/Cinder/Juno/__init__.py → Cinder/Juno-eol/__init__.py b/Cinder/Juno/__init__.py → Cinder/Juno-eol/__init__.py
diff --git a/Cinder/Juno/constants.py → Cinder/Juno-eol/constants.py b/Cinder/Juno/constants.py → Cinder/Juno-eol/constants.py
diff --git a/Cinder/Juno/extend/__init__.py → Cinder/Juno-eol/extend/__init__.py b/Cinder/Juno/extend/__init__.py → Cinder/Juno-eol/extend/__init__.py
diff --git a/Cinder/Juno/extend/fc_zone_helper.py → Cinder/Juno-eol/extend/fc_zone_helper.py b/Cinder/Juno/extend/fc_zone_helper.py → Cinder/Juno-eol/extend/fc_zone_helper.py
diff --git a/Cinder/Juno/fc_zone_helper.py → Cinder/Juno-eol/fc_zone_helper.py b/Cinder/Juno/fc_zone_helper.py → Cinder/Juno-eol/fc_zone_helper.py
diff --git a/Cinder/Juno/huawei_conf.py → Cinder/Juno-eol/huawei_conf.py b/Cinder/Juno/huawei_conf.py → Cinder/Juno-eol/huawei_conf.py
diff --git a/Cinder/Juno/huawei_driver.py → Cinder/Juno-eol/huawei_driver.py b/Cinder/Juno/huawei_driver.py → Cinder/Juno-eol/huawei_driver.py
diff --git a/Cinder/Juno/huawei_t.py → Cinder/Juno-eol/huawei_t.py b/Cinder/Juno/huawei_t.py → Cinder/Juno-eol/huawei_t.py
diff --git a/Cinder/Juno/huawei_utils.py → Cinder/Juno-eol/huawei_utils.py b/Cinder/Juno/huawei_utils.py → Cinder/Juno-eol/huawei_utils.py
diff --git a/Cinder/Juno/hypermetro.py → Cinder/Juno-eol/hypermetro.py b/Cinder/Juno/hypermetro.py → Cinder/Juno-eol/hypermetro.py
diff --git a/Cinder/Juno/replication.py → Cinder/Juno-eol/replication.py b/Cinder/Juno/replication.py → Cinder/Juno-eol/replication.py
diff --git a/Cinder/Juno/rest_client.py → Cinder/Juno-eol/rest_client.py b/Cinder/Juno/rest_client.py → Cinder/Juno-eol/rest_client.py
diff --git a/Cinder/Juno/smartx.py → Cinder/Juno-eol/smartx.py b/Cinder/Juno/smartx.py → Cinder/Juno-eol/smartx.py
diff --git a/Cinder/Juno/ssh_client.py → Cinder/Juno-eol/ssh_client.py b/Cinder/Juno/ssh_client.py → Cinder/Juno-eol/ssh_client.py
diff --git a/Cinder/Kilo/__init__.py → Cinder/Kilo-eol/__init__.py b/Cinder/Kilo/__init__.py → Cinder/Kilo-eol/__init__.py
diff --git a/Cinder/Kilo/constants.py → Cinder/Kilo-eol/constants.py b/Cinder/Kilo/constants.py → Cinder/Kilo-eol/constants.py
diff --git a/Cinder/Kilo/extend/__init__.py → Cinder/Kilo-eol/extend/__init__.py b/Cinder/Kilo/extend/__init__.py → Cinder/Kilo-eol/extend/__init__.py
diff --git a/Cinder/Kilo/extend/fc_zone_helper.py → Cinder/Kilo-eol/extend/fc_zone_helper.py b/Cinder/Kilo/extend/fc_zone_helper.py → Cinder/Kilo-eol/extend/fc_zone_helper.py
diff --git a/Cinder/Kilo/fc_zone_helper.py → Cinder/Kilo-eol/fc_zone_helper.py b/Cinder/Kilo/fc_zone_helper.py → Cinder/Kilo-eol/fc_zone_helper.py
diff --git a/Cinder/Kilo/huawei_conf.py → Cinder/Kilo-eol/huawei_conf.py b/Cinder/Kilo/huawei_conf.py → Cinder/Kilo-eol/huawei_conf.py
diff --git a/Cinder/Kilo/huawei_driver.py → Cinder/Kilo-eol/huawei_driver.py b/Cinder/Kilo/huawei_driver.py → Cinder/Kilo-eol/huawei_driver.py
diff --git a/Cinder/Kilo/huawei_t.py → Cinder/Kilo-eol/huawei_t.py b/Cinder/Kilo/huawei_t.py → Cinder/Kilo-eol/huawei_t.py
diff --git a/Cinder/Kilo/huawei_utils.py → Cinder/Kilo-eol/huawei_utils.py b/Cinder/Kilo/huawei_utils.py → Cinder/Kilo-eol/huawei_utils.py
diff --git a/Cinder/Kilo/hypermetro.py → Cinder/Kilo-eol/hypermetro.py b/Cinder/Kilo/hypermetro.py → Cinder/Kilo-eol/hypermetro.py
diff --git a/Cinder/Kilo/replication.py → Cinder/Kilo-eol/replication.py b/Cinder/Kilo/replication.py → Cinder/Kilo-eol/replication.py
diff --git a/Cinder/Kilo/rest_client.py → Cinder/Kilo-eol/rest_client.py b/Cinder/Kilo/rest_client.py → Cinder/Kilo-eol/rest_client.py
diff --git a/Cinder/Kilo/smartx.py → Cinder/Kilo-eol/smartx.py b/Cinder/Kilo/smartx.py → Cinder/Kilo-eol/smartx.py
diff --git a/Cinder/Kilo/ssh_client.py → Cinder/Kilo-eol/ssh_client.py b/Cinder/Kilo/ssh_client.py → Cinder/Kilo-eol/ssh_client.py
diff --git a/Cinder/Liberty/__init__.py → Cinder/Liberty-eol/__init__.py b/Cinder/Liberty/__init__.py → Cinder/Liberty-eol/__init__.py
diff --git a/Cinder/Liberty/constants.py → Cinder/Liberty-eol/constants.py b/Cinder/Liberty/constants.py → Cinder/Liberty-eol/constants.py
diff --git a/Cinder/Liberty/extend/__init__.py → Cinder/Liberty-eol/extend/__init__.py b/Cinder/Liberty/extend/__init__.py → Cinder/Liberty-eol/extend/__init__.py
diff --git a/Cinder/Liberty/extend/fc_zone_helper.py → Cinder/Liberty-eol/extend/fc_zone_helper.py b/Cinder/Liberty/extend/fc_zone_helper.py → Cinder/Liberty-eol/extend/fc_zone_helper.py
diff --git a/Cinder/Liberty/fc_zone_helper.py → Cinder/Liberty-eol/fc_zone_helper.py b/Cinder/Liberty/fc_zone_helper.py → Cinder/Liberty-eol/fc_zone_helper.py
diff --git a/Cinder/Liberty/huawei_conf.py → Cinder/Liberty-eol/huawei_conf.py b/Cinder/Liberty/huawei_conf.py → Cinder/Liberty-eol/huawei_conf.py
diff --git a/Cinder/Liberty/huawei_driver.py → Cinder/Liberty-eol/huawei_driver.py b/Cinder/Liberty/huawei_driver.py → Cinder/Liberty-eol/huawei_driver.py
diff --git a/Cinder/Liberty/huawei_t.py → Cinder/Liberty-eol/huawei_t.py b/Cinder/Liberty/huawei_t.py → Cinder/Liberty-eol/huawei_t.py
diff --git a/Cinder/Liberty/huawei_utils.py → Cinder/Liberty-eol/huawei_utils.py b/Cinder/Liberty/huawei_utils.py → Cinder/Liberty-eol/huawei_utils.py
diff --git a/Cinder/Liberty/hypermetro.py → Cinder/Liberty-eol/hypermetro.py b/Cinder/Liberty/hypermetro.py → Cinder/Liberty-eol/hypermetro.py
diff --git a/Cinder/Liberty/replication.py → Cinder/Liberty-eol/replication.py b/Cinder/Liberty/replication.py → Cinder/Liberty-eol/replication.py
diff --git a/Cinder/Liberty/rest_client.py → Cinder/Liberty-eol/rest_client.py b/Cinder/Liberty/rest_client.py → Cinder/Liberty-eol/rest_client.py
diff --git a/Cinder/Liberty/smartx.py → Cinder/Liberty-eol/smartx.py b/Cinder/Liberty/smartx.py → Cinder/Liberty-eol/smartx.py
diff --git a/Cinder/Liberty/ssh_client.py → Cinder/Liberty-eol/ssh_client.py b/Cinder/Liberty/ssh_client.py → Cinder/Liberty-eol/ssh_client.py
diff --git a/Cinder/Mitaka/__init__.py → Cinder/Mitaka-eol/__init__.py b/Cinder/Mitaka/__init__.py → Cinder/Mitaka-eol/__init__.py
diff --git a/Cinder/Mitaka/constants.py → Cinder/Mitaka-eol/constants.py b/Cinder/Mitaka/constants.py → Cinder/Mitaka-eol/constants.py
diff --git a/Cinder/Mitaka/extend/__init__.py → Cinder/Mitaka-eol/extend/__init__.py b/Cinder/Mitaka/extend/__init__.py → Cinder/Mitaka-eol/extend/__init__.py
diff --git a/Cinder/Mitaka/extend/fc_zone_helper.py → Cinder/Mitaka-eol/extend/fc_zone_helper.py b/Cinder/Mitaka/extend/fc_zone_helper.py → Cinder/Mitaka-eol/extend/fc_zone_helper.py
diff --git a/Cinder/Mitaka/fc_zone_helper.py → Cinder/Mitaka-eol/fc_zone_helper.py b/Cinder/Mitaka/fc_zone_helper.py → Cinder/Mitaka-eol/fc_zone_helper.py
diff --git a/Cinder/Mitaka/huawei_conf.py → Cinder/Mitaka-eol/huawei_conf.py b/Cinder/Mitaka/huawei_conf.py → Cinder/Mitaka-eol/huawei_conf.py
diff --git a/Cinder/Mitaka/huawei_driver.py → Cinder/Mitaka-eol/huawei_driver.py b/Cinder/Mitaka/huawei_driver.py → Cinder/Mitaka-eol/huawei_driver.py
@@ -2706,17 +2706,14 @@ def _terminate_connection(self, volume, connector, local=True):
         portgroup_id = None
         view_id = None
         left_lunnum = -1
-        portgroup = client.find_portgroup_info(
-            initiator_name, host_name)
 
-        if portgroup:
-            portgroup_id = client.get_tgt_port_group(portgroup)
         host_id = huawei_utils.get_host_id(client, host_name)
         if host_id:
             mapping_view_name = constants.MAPPING_VIEW_PREFIX + host_id
             view_id = client.find_mapping_view(mapping_view_name)
             if view_id:
                 lungroup_id = client.find_lungroup_from_map(view_id)
+				portgroup_id = client.get_portgroup_by_view(view_id)
 
         # Remove lun from lungroup.
         if lun_id and lungroup_id:

diff --git a/Cinder/Mitaka/huawei_t.py → Cinder/Mitaka-eol/huawei_t.py b/Cinder/Mitaka/huawei_t.py → Cinder/Mitaka-eol/huawei_t.py
diff --git a/Cinder/Mitaka/huawei_utils.py → Cinder/Mitaka-eol/huawei_utils.py b/Cinder/Mitaka/huawei_utils.py → Cinder/Mitaka-eol/huawei_utils.py
diff --git a/Cinder/Mitaka/hypermetro.py → Cinder/Mitaka-eol/hypermetro.py b/Cinder/Mitaka/hypermetro.py → Cinder/Mitaka-eol/hypermetro.py
diff --git a/Cinder/Mitaka/replication.py → Cinder/Mitaka-eol/replication.py b/Cinder/Mitaka/replication.py → Cinder/Mitaka-eol/replication.py
diff --git a/Cinder/Mitaka/rest_client.py → Cinder/Mitaka-eol/rest_client.py b/Cinder/Mitaka/rest_client.py → Cinder/Mitaka-eol/rest_client.py
diff --git a/Cinder/Mitaka/smartx.py → Cinder/Mitaka-eol/smartx.py b/Cinder/Mitaka/smartx.py → Cinder/Mitaka-eol/smartx.py
diff --git a/Cinder/Mitaka/ssh_client.py → Cinder/Mitaka-eol/ssh_client.py b/Cinder/Mitaka/ssh_client.py → Cinder/Mitaka-eol/ssh_client.py
diff --git a/Cinder/Newton/__init__.py → Cinder/Newton-eol/__init__.py b/Cinder/Newton/__init__.py → Cinder/Newton-eol/__init__.py
diff --git a/Cinder/Newton/constants.py → Cinder/Newton-eol/constants.py b/Cinder/Newton/constants.py → Cinder/Newton-eol/constants.py
diff --git a/Cinder/Newton/extend/__init__.py → Cinder/Newton-eol/extend/__init__.py b/Cinder/Newton/extend/__init__.py → Cinder/Newton-eol/extend/__init__.py
diff --git a/Cinder/Newton/extend/fc_zone_helper.py → Cinder/Newton-eol/extend/fc_zone_helper.py b/Cinder/Newton/extend/fc_zone_helper.py → Cinder/Newton-eol/extend/fc_zone_helper.py
diff --git a/Cinder/Newton/fc_zone_helper.py → Cinder/Newton-eol/fc_zone_helper.py b/Cinder/Newton/fc_zone_helper.py → Cinder/Newton-eol/fc_zone_helper.py
diff --git a/Cinder/Newton/huawei_conf.py → Cinder/Newton-eol/huawei_conf.py b/Cinder/Newton/huawei_conf.py → Cinder/Newton-eol/huawei_conf.py
diff --git a/Cinder/Newton/huawei_driver.py → Cinder/Newton-eol/huawei_driver.py b/Cinder/Newton/huawei_driver.py → Cinder/Newton-eol/huawei_driver.py
diff --git a/Cinder/Newton/huawei_t.py → Cinder/Newton-eol/huawei_t.py b/Cinder/Newton/huawei_t.py → Cinder/Newton-eol/huawei_t.py
diff --git a/Cinder/Newton/huawei_utils.py → Cinder/Newton-eol/huawei_utils.py b/Cinder/Newton/huawei_utils.py → Cinder/Newton-eol/huawei_utils.py
diff --git a/Cinder/Newton/hypermetro.py → Cinder/Newton-eol/hypermetro.py b/Cinder/Newton/hypermetro.py → Cinder/Newton-eol/hypermetro.py
diff --git a/Cinder/Newton/replication.py → Cinder/Newton-eol/replication.py b/Cinder/Newton/replication.py → Cinder/Newton-eol/replication.py
diff --git a/Cinder/Newton/rest_client.py → Cinder/Newton-eol/rest_client.py b/Cinder/Newton/rest_client.py → Cinder/Newton-eol/rest_client.py
diff --git a/Cinder/Newton/smartx.py → Cinder/Newton-eol/smartx.py b/Cinder/Newton/smartx.py → Cinder/Newton-eol/smartx.py
diff --git a/Cinder/Newton/ssh_client.py → Cinder/Newton-eol/ssh_client.py b/Cinder/Newton/ssh_client.py → Cinder/Newton-eol/ssh_client.py
diff --git a/Manila/Kilo/__init__.py → Manila/Kilo-eol/__init__.py b/Manila/Kilo/__init__.py → Manila/Kilo-eol/__init__.py
diff --git a/Manila/Kilo/constants.py → Manila/Kilo-eol/constants.py b/Manila/Kilo/constants.py → Manila/Kilo-eol/constants.py
diff --git a/Manila/Kilo/huawei_helper.py → Manila/Kilo-eol/huawei_helper.py b/Manila/Kilo/huawei_helper.py → Manila/Kilo-eol/huawei_helper.py
diff --git a/Manila/Kilo/huawei_nas.py → Manila/Kilo-eol/huawei_nas.py b/Manila/Kilo/huawei_nas.py → Manila/Kilo-eol/huawei_nas.py
diff --git a/Manila/Liberty/__init__.py → Manila/Liberty-eol/__init__.py b/Manila/Liberty/__init__.py → Manila/Liberty-eol/__init__.py
diff --git a/Manila/Liberty/base.py → Manila/Liberty-eol/base.py b/Manila/Liberty/base.py → Manila/Liberty-eol/base.py
diff --git a/Manila/Liberty/constants.py → Manila/Liberty-eol/constants.py b/Manila/Liberty/constants.py → Manila/Liberty-eol/constants.py
diff --git a/Manila/Liberty/huawei_nas.py → Manila/Liberty-eol/huawei_nas.py b/Manila/Liberty/huawei_nas.py → Manila/Liberty-eol/huawei_nas.py
diff --git a/Manila/Liberty/huawei_utils.py → Manila/Liberty-eol/huawei_utils.py b/Manila/Liberty/huawei_utils.py → Manila/Liberty-eol/huawei_utils.py
diff --git a/Manila/Liberty/v3/__init__.py → Manila/Liberty-eol/v3/__init__.py b/Manila/Liberty/v3/__init__.py → Manila/Liberty-eol/v3/__init__.py
diff --git a/Manila/Liberty/v3/connection.py → Manila/Liberty-eol/v3/connection.py b/Manila/Liberty/v3/connection.py → Manila/Liberty-eol/v3/connection.py
diff --git a/Manila/Liberty/v3/helper.py → Manila/Liberty-eol/v3/helper.py b/Manila/Liberty/v3/helper.py → Manila/Liberty-eol/v3/helper.py
diff --git a/Manila/Liberty/v3/smartx.py → Manila/Liberty-eol/v3/smartx.py b/Manila/Liberty/v3/smartx.py → Manila/Liberty-eol/v3/smartx.py
diff --git a/Manila/Mitaka/__init__.py → Manila/Mitaka-eol/__init__.py b/Manila/Mitaka/__init__.py → Manila/Mitaka-eol/__init__.py
diff --git a/Manila/Mitaka/base.py → Manila/Mitaka-eol/base.py b/Manila/Mitaka/base.py → Manila/Mitaka-eol/base.py
diff --git a/Manila/Mitaka/constants.py → Manila/Mitaka-eol/constants.py b/Manila/Mitaka/constants.py → Manila/Mitaka-eol/constants.py
diff --git a/Manila/Mitaka/huawei_nas.py → Manila/Mitaka-eol/huawei_nas.py b/Manila/Mitaka/huawei_nas.py → Manila/Mitaka-eol/huawei_nas.py
diff --git a/Manila/Mitaka/huawei_utils.py → Manila/Mitaka-eol/huawei_utils.py b/Manila/Mitaka/huawei_utils.py → Manila/Mitaka-eol/huawei_utils.py
diff --git a/Manila/Mitaka/v3/__init__.py → Manila/Mitaka-eol/v3/__init__.py b/Manila/Mitaka/v3/__init__.py → Manila/Mitaka-eol/v3/__init__.py
diff --git a/Manila/Mitaka/v3/connection.py → Manila/Mitaka-eol/v3/connection.py b/Manila/Mitaka/v3/connection.py → Manila/Mitaka-eol/v3/connection.py
diff --git a/Manila/Mitaka/v3/helper.py → Manila/Mitaka-eol/v3/helper.py b/Manila/Mitaka/v3/helper.py → Manila/Mitaka-eol/v3/helper.py
diff --git a/Manila/Mitaka/v3/smartx.py → Manila/Mitaka-eol/v3/smartx.py b/Manila/Mitaka/v3/smartx.py → Manila/Mitaka-eol/v3/smartx.py
diff --git a/Manila/Newton/__init__.py → Manila/Newton-eol/__init__.py b/Manila/Newton/__init__.py → Manila/Newton-eol/__init__.py
diff --git a/Manila/Newton/base.py → Manila/Newton-eol/base.py b/Manila/Newton/base.py → Manila/Newton-eol/base.py
diff --git a/Manila/Newton/constants.py → Manila/Newton-eol/constants.py b/Manila/Newton/constants.py → Manila/Newton-eol/constants.py
diff --git a/Manila/Newton/huawei_nas.py → Manila/Newton-eol/huawei_nas.py b/Manila/Newton/huawei_nas.py → Manila/Newton-eol/huawei_nas.py
diff --git a/Manila/Newton/huawei_utils.py → Manila/Newton-eol/huawei_utils.py b/Manila/Newton/huawei_utils.py → Manila/Newton-eol/huawei_utils.py
diff --git a/Manila/Newton/v3/__init__.py → Manila/Newton-eol/v3/__init__.py b/Manila/Newton/v3/__init__.py → Manila/Newton-eol/v3/__init__.py
diff --git a/Manila/Newton/v3/connection.py → Manila/Newton-eol/v3/connection.py b/Manila/Newton/v3/connection.py → Manila/Newton-eol/v3/connection.py
diff --git a/Manila/Newton/v3/helper.py → Manila/Newton-eol/v3/helper.py b/Manila/Newton/v3/helper.py → Manila/Newton-eol/v3/helper.py
diff --git a/Manila/Newton/v3/manager.py → Manila/Newton-eol/v3/manager.py b/Manila/Newton/v3/manager.py → Manila/Newton-eol/v3/manager.py
diff --git a/Manila/Newton/v3/replication.py → Manila/Newton-eol/v3/replication.py b/Manila/Newton/v3/replication.py → Manila/Newton-eol/v3/replication.py
diff --git a/Manila/Newton/v3/rpcapi.py → Manila/Newton-eol/v3/rpcapi.py b/Manila/Newton/v3/rpcapi.py → Manila/Newton-eol/v3/rpcapi.py
diff --git a/Manila/Newton/v3/smartx.py → Manila/Newton-eol/v3/smartx.py b/Manila/Newton/v3/smartx.py → Manila/Newton-eol/v3/smartx.py