X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Fopenstack%2Ftests%2Fconf%2Fos_credentials_tests.py;h=333de594cf95b68737f8bbdc496db6a9d32f6672;hb=3688eb42266a2a96a16eb140eebf6f86a7bc126b;hp=a4cfa61da4bd7f6b16e639a0304c86f816bc6f94;hpb=6c43b694e139efdf77540ac1518c422c5bc2574c;p=snaps.git

diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py
index a4cfa61..333de59 100644
--- a/snaps/openstack/tests/conf/os_credentials_tests.py
+++ b/snaps/openstack/tests/conf/os_credentials_tests.py
@@ -16,8 +16,8 @@
 import logging
 import unittest
 
-from snaps.openstack.os_credentials import OSCredsError, OSCreds, \
-    ProxySettings, ProxySettingsError
+from snaps.openstack.os_credentials import (
+    OSCredsError, OSCreds, ProxySettings, ProxySettingsError)
 
 __author__ = 'spisarski'
 
@@ -56,17 +56,17 @@ class ProxySettingsUnitTests(unittest.TestCase):
     def test_minimum(self):
         proxy_settings = ProxySettings(host='foo', port=1234)
         self.assertEqual('foo', proxy_settings.host)
-        self.assertEqual(1234, proxy_settings.port)
+        self.assertEqual('1234', proxy_settings.port)
         self.assertEqual('foo', proxy_settings.https_host)
-        self.assertEqual(1234, proxy_settings.https_port)
+        self.assertEqual('1234', proxy_settings.https_port)
         self.assertIsNone(proxy_settings.ssh_proxy_cmd)
 
     def test_minimum_kwargs(self):
         proxy_settings = ProxySettings(**{'host': 'foo', 'port': 1234})
         self.assertEqual('foo', proxy_settings.host)
-        self.assertEqual(1234, proxy_settings.port)
+        self.assertEqual('1234', proxy_settings.port)
         self.assertEqual('foo', proxy_settings.https_host)
-        self.assertEqual(1234, proxy_settings.https_port)
+        self.assertEqual('1234', proxy_settings.https_port)
         self.assertIsNone(proxy_settings.ssh_proxy_cmd)
 
     def test_all(self):
@@ -74,9 +74,9 @@ class ProxySettingsUnitTests(unittest.TestCase):
             host='foo', port=1234, https_host='bar', https_port=2345,
             ssh_proxy_cmd='proxy command')
         self.assertEqual('foo', proxy_settings.host)
-        self.assertEqual(1234, proxy_settings.port)
+        self.assertEqual('1234', proxy_settings.port)
         self.assertEqual('bar', proxy_settings.https_host)
-        self.assertEqual(2345, proxy_settings.https_port)
+        self.assertEqual('2345', proxy_settings.https_port)
         self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd)
 
     def test_all_kwargs(self):
@@ -84,9 +84,9 @@ class ProxySettingsUnitTests(unittest.TestCase):
             **{'host': 'foo', 'port': 1234, 'https_host': 'bar',
                'https_port': 2345, 'ssh_proxy_cmd': 'proxy command'})
         self.assertEqual('foo', proxy_settings.host)
-        self.assertEqual(1234, proxy_settings.port)
+        self.assertEqual('1234', proxy_settings.port)
         self.assertEqual('bar', proxy_settings.https_host)
-        self.assertEqual(2345, proxy_settings.https_port)
+        self.assertEqual('2345', proxy_settings.https_port)
         self.assertEqual('proxy command', proxy_settings.ssh_proxy_cmd)
 
 
@@ -158,10 +158,13 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
+        self.assertIsNone(os_creds.region_name)
 
     def test_minimal_kwargs(self):
         os_creds = OSCreds(**{'username': 'foo', 'password': 'bar',
@@ -176,17 +179,21 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
+        self.assertIsNone(os_creds.region_name)
 
     def test_all_kwargs_versions_str(self):
         os_creds = OSCreds(
             **{'username': 'foo', 'password': 'bar',
                'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello',
                'identity_api_version': '5', 'image_api_version': '6',
-               'compute_api_version': '7', 'heat_api_version': '8.0'})
+               'compute_api_version': '7', 'heat_api_version': '8.0',
+               'cacert': 'true', 'region_name': 'test_region'})
         self.assertEqual('foo', os_creds.username)
         self.assertEqual('bar', os_creds.password)
         self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url)
@@ -196,17 +203,21 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(7, os_creds.compute_api_version)
         self.assertEqual(8.0, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
         self.assertTrue(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
+        self.assertEqual('test_region', os_creds.region_name)
 
     def test_all_kwargs_versions_num(self):
         os_creds = OSCreds(
             **{'username': 'foo', 'password': 'bar',
                'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello',
                'identity_api_version': 5, 'image_api_version': 6,
-               'compute_api_version': 7, 'heat_api_version': 8.0})
+               'compute_api_version': 7, 'heat_api_version': 8.0,
+               'cacert': True, 'region_name': 'test_region'})
         self.assertEqual('foo', os_creds.username)
         self.assertEqual('bar', os_creds.password)
         self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url)
@@ -216,10 +227,13 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(7, os_creds.compute_api_version)
         self.assertEqual(8.0, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
         self.assertTrue(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
+        self.assertEqual('test_region', os_creds.region_name)
 
     def test_proxy_settings_obj(self):
         proxy_settings = ProxySettings(host='foo', port=1234)
@@ -235,19 +249,25 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
-        self.assertEqual(1234, os_creds.proxy_settings.port)
+        self.assertEqual('1234', os_creds.proxy_settings.port)
         self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd)
+        self.assertIsNone(os_creds.region_name)
 
     def test_proxy_settings_obj_kwargs(self):
         proxy_settings = ProxySettings(host='foo', port=1234)
-        os_creds = OSCreds(**{'username': 'foo', 'password': 'bar',
-                              'auth_url': 'http://foo.bar:5000/v2',
-                              'project_name': 'hello',
-                              'proxy_settings': proxy_settings})
+        os_creds = OSCreds(
+            **{'username': 'foo', 'password': 'bar',
+               'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello',
+               'proxy_settings': proxy_settings, 'region_name': 'test_region',
+               'user_domain_id': 'domain1', 'user_domain_name': 'domain2',
+               'project_domain_id': 'domain3',
+               'project_domain_name': 'domain4'})
         self.assertEqual('foo', os_creds.username)
         self.assertEqual('bar', os_creds.password)
         self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url)
@@ -256,18 +276,23 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.image_api_version)
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
-        self.assertEqual('default', os_creds.user_domain_id)
-        self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('domain1', os_creds.user_domain_id)
+        self.assertEqual('domain2', os_creds.user_domain_name)
+        self.assertEqual('domain3', os_creds.project_domain_id)
+        self.assertEqual('domain4', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
-        self.assertEqual(1234, os_creds.proxy_settings.port)
+        self.assertEqual('1234', os_creds.proxy_settings.port)
         self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd)
+        self.assertEqual('test_region', os_creds.region_name)
 
     def test_proxy_settings_dict(self):
         os_creds = OSCreds(
             username='foo', password='bar', auth_url='http://foo.bar:5000/v2',
-            project_name='hello', proxy_settings={'host': 'foo', 'port': 1234})
+            project_name='hello', proxy_settings={'host': 'foo', 'port': 1234},
+            user_domain_id='domain1', user_domain_name='domain2',
+            project_domain_id='domain3', project_domain_name='domain4')
         self.assertEqual('foo', os_creds.username)
         self.assertEqual('bar', os_creds.password)
         self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url)
@@ -276,19 +301,22 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.image_api_version)
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
-        self.assertEqual('default', os_creds.user_domain_id)
-        self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('domain1', os_creds.user_domain_id)
+        self.assertEqual('domain2', os_creds.user_domain_name)
+        self.assertEqual('domain3', os_creds.project_domain_id)
+        self.assertEqual('domain4', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
-        self.assertEqual(1234, os_creds.proxy_settings.port)
+        self.assertEqual('1234', os_creds.proxy_settings.port)
         self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd)
 
     def test_proxy_settings_dict_kwargs(self):
-        os_creds = OSCreds(**{'username': 'foo', 'password': 'bar',
-                              'auth_url': 'http://foo.bar:5000/v2',
-                              'project_name': 'hello',
-                              'proxy_settings': {'host': 'foo', 'port': 1234}})
+        os_creds = OSCreds(
+            **{'username': 'foo', 'password': 'bar',
+               'auth_url': 'http://foo.bar:5000/v2', 'project_name': 'hello',
+               'proxy_settings': {'host': 'foo', 'port': 1234},
+               'region_name': 'test_region'})
         self.assertEqual('foo', os_creds.username)
         self.assertEqual('bar', os_creds.password)
         self.assertEqual('http://foo.bar:5000/v2', os_creds.auth_url)
@@ -298,9 +326,12 @@ class OSCredsUnitTests(unittest.TestCase):
         self.assertEqual(2, os_creds.compute_api_version)
         self.assertEqual(1, os_creds.heat_api_version)
         self.assertEqual('default', os_creds.user_domain_id)
+        self.assertEqual('Default', os_creds.user_domain_name)
         self.assertEqual('default', os_creds.project_domain_id)
+        self.assertEqual('Default', os_creds.project_domain_name)
         self.assertEqual('admin', os_creds.interface)
-        self.assertTrue(os_creds.cacert)
+        self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
-        self.assertEqual(1234, os_creds.proxy_settings.port)
+        self.assertEqual('1234', os_creds.proxy_settings.port)
         self.assertIsNone(os_creds.proxy_settings.ssh_proxy_cmd)
+        self.assertEqual('test_region', os_creds.region_name)