summaryrefslogtreecommitdiffstats
path: root/newton/newton/pub/tests/test_extsys.py
diff options
context:
space:
mode:
Diffstat (limited to 'newton/newton/pub/tests/test_extsys.py')
-rw-r--r--newton/newton/pub/tests/test_extsys.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/newton/newton/pub/tests/test_extsys.py b/newton/newton/pub/tests/test_extsys.py
index 533910f9..9e67dcc0 100644
--- a/newton/newton/pub/tests/test_extsys.py
+++ b/newton/newton/pub/tests/test_extsys.py
@@ -31,10 +31,12 @@ MOCK_ESR_SYSTEM_INFO = {
"service-url": "http://localhost",
"default-tenant": "demo",
"ssl-cacert": None,
- "ssl-insecure": None
+ "ssl-insecure": None,
+ "resource-version":"1978882"
}
MOCK_VIM_INFO = {
+ "resource-version":"1978883",
"cloud-type": "openstack",
"complex-name": "complex",
"cloud-region-version": "Regionv1",
@@ -49,6 +51,7 @@ MOCK_VIM_INFO = {
}
+
def returnList(items):
def func():
for item in items:
@@ -111,7 +114,12 @@ class TestEpaCaps(unittest.TestCase):
self.assertEquals(MOCK_ESR_SYSTEM_INFO['ssl-insecure'], viminfo['insecure'])
def test_delete_vim_by_id(self):
- values = [(1, "test_content", 500),(0, None, None)]
+ values = [
+ (0, json.dumps(MOCK_VIM_INFO), None),
+ (1, "test_content", 500),
+ (0, json.dumps(MOCK_VIM_INFO), None),
+ (0, None, None)
+ ]
restcall.req_to_aai = mock.Mock(side_effect=returnList(values))
self.assertRaises(VimDriverNewtonException, extsys.delete_vim_by_id, self.vim_id)
@@ -120,4 +128,4 @@ class TestEpaCaps(unittest.TestCase):
def test_decode_vim_id_successfuly(self):
owner, region_id = extsys.decode_vim_id(self.vim_id)
self.assertEquals(self.cloud_onwer, owner)
- self.assertEquals(self.cloud_region_id, region_id) \ No newline at end of file
+ self.assertEquals(self.cloud_region_id, region_id)