You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2018/12/19 05:34:17 UTC
[15/21] libcloud git commit: Added 'ex' prefix to all DRS related
methods
Added 'ex' prefix to all DRS related methods
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/cf27a09f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/cf27a09f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/cf27a09f
Branch: refs/heads/trunk
Commit: cf27a09f4c76a320e9baf19fda7ea81b044ca1a1
Parents: da71f40
Author: mitch <mi...@itaas.dimensiondata.com>
Authored: Tue Dec 18 17:32:50 2018 -0500
Committer: mitch <mi...@itaas.dimensiondata.com>
Committed: Tue Dec 18 17:32:50 2018 -0500
----------------------------------------------------------------------
libcloud/compute/drivers/nttcis.py | 18 +++++++--------
libcloud/test/compute/test_nttcis.py | 38 +++++++++++++++----------------
2 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/cf27a09f/libcloud/compute/drivers/nttcis.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/nttcis.py b/libcloud/compute/drivers/nttcis.py
index 9ac0f36..2b86fda 100644
--- a/libcloud/compute/drivers/nttcis.py
+++ b/libcloud/compute/drivers/nttcis.py
@@ -4650,7 +4650,7 @@ class NttCisNodeDriver(NodeDriver):
return new_node
# DRS methods
- def create_consistency_group(self, name, journal_size_gb,
+ def ex_create_consistency_group(self, name, journal_size_gb,
source_server_id, target_server_id,
description=None):
"""
@@ -4690,7 +4690,7 @@ class NttCisNodeDriver(NodeDriver):
return response_code in ['IN_PROGRESS', 'OK']
@get_params
- def list_consistency_groups(self, params={}):
+ def ex_list_consistency_groups(self, params={}):
"""
Functions takes a named parameter that must be one of the following
:param params: A dictionary composed of one of the following keys
@@ -4712,7 +4712,7 @@ class NttCisNodeDriver(NodeDriver):
cgs = self._to_consistency_groups(response)
return cgs
- def get_consistency_group(self, consistency_group_id):
+ def ex_get_consistency_group(self, consistency_group_id):
"""
Retrieves a Consistency by it's id and is more efficient thatn listing
all consistency groups and filtering that result.
@@ -4726,7 +4726,7 @@ class NttCisNodeDriver(NodeDriver):
cg = self._to_process(response)
return cg
- def list_consistency_group_snapshots(self, consistency_group_id,
+ def ex_list_consistency_group_snapshots(self, consistency_group_id,
create_time_min=None,
create_time_max=None):
"""
@@ -4778,7 +4778,7 @@ class NttCisNodeDriver(NodeDriver):
snapshots = self._to_process(paged_result)
return snapshots
- def expand_journal(self, consistency_group_id, size_gb):
+ def ex_expand_journal(self, consistency_group_id, size_gb):
"""
Expand the consistency group's journhal size in 100Gb increments
:param consistency_group_id: The consistency group's UUID
@@ -4798,7 +4798,7 @@ class NttCisNodeDriver(NodeDriver):
response_code = findtext(response, 'responseCode', TYPES_URN)
return response_code in ['IN_PROGRESS', 'OK']
- def start_drs_failover_preview(self, consistency_group_id, snapshot_id):
+ def ex_start_drs_failover_preview(self, consistency_group_id, snapshot_id):
"""
Brings a Consistency Group into PREVIEWING_SNAPSHOT mode
@@ -4822,7 +4822,7 @@ class NttCisNodeDriver(NodeDriver):
response_code = findtext(response, 'responseCode', TYPES_URN)
return response_code in ['IN_PROGRESS', 'OK']
- def stop_drs_failover_preview(self, consistency_group_id):
+ def ex_stop_drs_failover_preview(self, consistency_group_id):
"""
Takes a Consistency Group out of PREVIEW_MODE and back to DRS_MODE
@@ -4841,7 +4841,7 @@ class NttCisNodeDriver(NodeDriver):
response_code = findtext(response, 'responseCode', TYPES_URN)
return response_code in ['IN_PROGRESS', 'OK']
- def initiate_drs_failover(self, consistency_group_id):
+ def ex_initiate_drs_failover(self, consistency_group_id):
"""
This method is irreversible.
It will failover the Consistency Group while removing it as well.
@@ -4861,7 +4861,7 @@ class NttCisNodeDriver(NodeDriver):
response_code = findtext(response, "responseCode", TYPES_URN)
return response_code in ["IN_PROGRESS", "OK"]
- def delete_consistency_group(self, consistency_group_id):
+ def ex_delete_consistency_group(self, consistency_group_id):
"""
Delete's a Consistency Group
http://git-wip-us.apache.org/repos/asf/libcloud/blob/cf27a09f/libcloud/test/compute/test_nttcis.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_nttcis.py b/libcloud/test/compute/test_nttcis.py
index 35c7eac..5e54131 100644
--- a/libcloud/test/compute/test_nttcis.py
+++ b/libcloud/test/compute/test_nttcis.py
@@ -1839,44 +1839,44 @@ def test_ex_list_tags_ALLPARAMS(driver):
def test_list_consistency_groups(driver):
- cgs = driver.list_consistency_groups()
+ cgs = driver.ex_list_consistency_groups()
assert isinstance(cgs, list)
def test_list_cg_by_src_net_domain(driver):
nd = "f9d6a249-c922-4fa1-9f0f-de5b452c4026"
- cgs = driver.list_consistency_groups(source_network_domain_id=nd)
+ cgs = driver.ex_list_consistency_groups(source_network_domain_id=nd)
assert cgs[0].name == "sdk_test2_cg"
def test_list_cg_by_name(driver):
NttCisMockHttp.type = "CG_BY_NAME"
name = "sdk_test2_cg"
- cg = driver.list_consistency_groups(name=name)
+ cg = driver.ex_list_consistency_groups(name=name)
assert cg[0].id == "195a426b-4559-4c79-849e-f22cdf2bfb6e"
def test_get_consistency_group_by_id(driver):
NttCisMockHttp.type = None
- cgs = driver.list_consistency_groups()
+ cgs = driver.ex_list_consistency_groups()
cg_id = [i for i in cgs if i.name == "sdk_test2_cg"][0].id
- cg = driver.get_consistency_group(cg_id)
+ cg = driver.ex_get_consistency_group(cg_id)
assert hasattr(cg, 'description')
def test_get_drs_snapshots(driver):
NttCisMockHttp.type = None
- cgs = driver.list_consistency_groups()
+ cgs = driver.ex_list_consistency_groups()
cg_id = [i for i in cgs if i.name == "sdk_test2_cg"][0].id
- snaps = driver.list_consistency_group_snapshots(cg_id)
+ snaps = driver.ex_list_consistency_group_snapshots(cg_id)
assert hasattr(snaps, 'journalUsageGb')
assert isinstance(snaps, ClassFactory)
def test_get_drs_snapshots_by_min_max(driver):
- cgs = driver.list_consistency_groups()
+ cgs = driver.ex_list_consistency_groups()
cg_id = [i for i in cgs if i.name == "sdk_test2_cg"][0].id
- snaps = driver.list_consistency_group_snapshots(
+ snaps = driver.ex_list_consistency_group_snapshots(
cg_id,
create_time_min="2018-11-28T00:00:00.000Z",
create_time_max="2018-11-29T00:00:00.000Z")
@@ -1885,23 +1885,23 @@ def test_get_drs_snapshots_by_min_max(driver):
def test_expand_drs_journal(driver):
- cgs = driver.list_consistency_groups(name="sdk_test2_cg")
+ cgs = driver.ex_list_consistency_groups(name="sdk_test2_cg")
cg_id = cgs[0].id
expand_by = "100"
- result = driver.expand_journal(cg_id, expand_by)
+ result = driver.ex_expand_journal(cg_id, expand_by)
assert result is True
def test_start_drs_snapshot_preview(driver):
cg_id = "195a426b-4559-4c79-849e-f22cdf2bfb6e"
snapshot_id = "3893"
- result = driver.start_drs_failover_preview(cg_id, snapshot_id)
+ result = driver.ex_start_drs_failover_preview(cg_id, snapshot_id)
assert result is True
def test_stop_drs_snapshot_preivew(driver):
cg_id = "195a426b-4559-4c79-849e-f22cdf2bfb6e"
- result = driver.stop_drs_failover_preview(cg_id)
+ result = driver.ex_stop_drs_failover_preview(cg_id)
assert result is True
@@ -1909,13 +1909,13 @@ def test_start_drs_failover_invalid_status(driver):
NttCisMockHttp.type = "INVALID_STATUS"
cg_id = "195a426b-4559-4c79-849e-f22cdf2bfb6e"
with pytest.raises(NttCisAPIException) as excinfo:
- result = driver.initiate_drs_failover(cg_id)
+ result = driver.ex_initiate_drs_failover(cg_id)
assert "INVALID_STATUS" in excinfo.value.code
def test_initiate_drs_failover(driver):
cg_id = "195a426b-4559-4c79-849e-f22cdf2bfb6e"
- result = driver.initiate_drs_failover(cg_id)
+ result = driver.ex_initiate_drs_failover(cg_id)
assert result is True
@@ -1924,7 +1924,7 @@ def test_create_drs_fail_not_supported(driver):
src_id = "032f3967-00e4-4780-b4ef-8587460f9dd4"
target_id = "aee58575-38e2-495f-89d3-854e6a886411"
with pytest.raises(NttCisAPIException) as excinfo:
- result = driver.create_consistency_group(
+ result = driver.ex_create_consistency_group(
"sdk_cg", "100", src_id, target_id, description="A test consistency group")
exception_msg = excinfo.value.msg
assert exception_msg == 'DRS is not supported between source Data Center NA9 and target Data Center NA12.'
@@ -1935,7 +1935,7 @@ def test_create_drs_cg_fail_ineligble(driver):
src_id = "032f3967-00e4-4780-b4ef-8587460f9dd4"
target_id = "aee58575-38e2-495f-89d3-854e6a886411"
with pytest.raises(NttCisAPIException) as excinfo:
- driver.create_consistency_group(
+ driver.ex_create_consistency_group(
"sdk_test2_cg", "100", src_id, target_id, description="A test consistency group")
exception_msg = excinfo.value.msg
assert exception_msg == 'The drsEligible flag for target Server aee58575-38e2-495f-89d3-854e6a886411 must be set.'
@@ -1944,14 +1944,14 @@ def test_create_drs_cg_fail_ineligble(driver):
def test_create_drs_cg(driver):
src_id = "032f3967-00e4-4780-b4ef-8587460f9dd4"
target_id = "aee58575-38e2-495f-89d3-854e6a886411"
- result = driver.create_consistency_group(
+ result = driver.ex_create_consistency_group(
"sdk_test2_cg2", "100", src_id, target_id, description="A test consistency group")
assert result is True
def test_delete_consistency_group(driver):
cg_id = "fad067be-6ca7-495d-99dc-7921c5f2ca5"
- result = driver.delete_consistency_group(cg_id)
+ result = driver.ex_delete_consistency_group(cg_id)
assert result is True