Enhanced launch.py app to support all types.

Added application support for users, projects, and
security groups. In addition, added support for multiple
credential sets so one can manage multiple projects
potentially on multiple clouds.

Added Jinja2 template support for substituting values
in the template file with values contained in the
environment file.

Added ansible substituion value for a VM's floating IP.
Changed credentials interface attribute's default value
from 'admin' to 'public'.

Added optional pre_sleep_time attribute to ansible execution
that will wait for a given number of seconds prior to attempting
to apply a playbook to a set of VMs.

JIRA: SNAPS-4, SNAPS-5, SNAPS-6, SNAPS-26

Change-Id: I67b8d69a3b06a43631d80e8fe0c56e02773dbfbe
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

3 files changed, 18 insertions, 24 deletions

diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py
index b63a91d..5efb32c 100644
--- a/snaps/openstack/tests/conf/os_credentials_tests.py
+++ b/snaps/openstack/tests/conf/os_credentials_tests.py
@@ -151,7 +151,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
         self.assertIsNone(os_creds.region_name)
@@ -172,7 +172,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
         self.assertIsNone(os_creds.region_name)
@@ -196,7 +196,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertTrue(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
         self.assertEqual('test_region', os_creds.region_name)
@@ -220,7 +220,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertTrue(os_creds.cacert)
         self.assertIsNone(os_creds.proxy_settings)
         self.assertEqual('test_region', os_creds.region_name)
@@ -242,7 +242,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
         self.assertEqual('1234', os_creds.proxy_settings.port)
@@ -270,7 +270,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
         self.assertEqual('1234', os_creds.proxy_settings.port)
@@ -295,7 +295,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
         self.assertEqual('1234', os_creds.proxy_settings.port)
@@ -319,7 +319,7 @@ class OSCredsUnitTests(unittest.TestCase):
         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.assertEqual('public', os_creds.interface)
         self.assertFalse(os_creds.cacert)
         self.assertEqual('foo', os_creds.proxy_settings.host)
         self.assertEqual('1234', os_creds.proxy_settings.port)
diff --git a/snaps/openstack/tests/create_image_tests.py b/snaps/openstack/tests/create_image_tests.py
index 7a6db86..f70a71c 100644
--- a/snaps/openstack/tests/create_image_tests.py
+++ b/snaps/openstack/tests/create_image_tests.py
@@ -77,19 +77,6 @@ class ImageSettingsUnitTests(unittest.TestCase):
             ImageSettings(
                 **{'name': 'foo', 'image_user': 'bar', 'format': 'qcow2'})
 
-    def test_name_user_format_url_file_only(self):
-        with self.assertRaises(ImageSettingsError):
-            ImageSettings(name='foo', image_user='bar', img_format='qcow2',
-                          url='http://foo.com',
-                          image_file='/foo/bar.qcow')
-
-    def test_config_with_name_user_format_url_file_only(self):
-        with self.assertRaises(ImageSettingsError):
-            ImageSettings(
-                **{'name': 'foo', 'image_user': 'bar', 'format': 'qcow2',
-                   'download_url': 'http://foo.com',
-                   'image_file': '/foo/bar.qcow'})
-
     def test_name_user_format_url_only(self):
         settings = ImageSettings(name='foo', image_user='bar',
                                  img_format='qcow2', url='http://foo.com')
diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py
index 0e1d0ae..aa9dcfb 100644
--- a/snaps/openstack/tests/create_project_tests.py
+++ b/snaps/openstack/tests/create_project_tests.py
@@ -49,6 +49,7 @@ class ProjectSettingsUnitTests(unittest.TestCase):
         self.assertEqual('Default', settings.domain_name)
         self.assertIsNone(settings.description)
         self.assertTrue(settings.enabled)
+        self.assertEqual(list(), settings.users)
 
     def test_config_with_name_only(self):
         settings = ProjectSettings(**{'name': 'foo'})
@@ -56,23 +57,29 @@ class ProjectSettingsUnitTests(unittest.TestCase):
         self.assertEqual('Default', settings.domain_name)
         self.assertIsNone(settings.description)
         self.assertTrue(settings.enabled)
+        self.assertEqual(list(), settings.users)
 
     def test_all(self):
-        settings = ProjectSettings(name='foo', domain='bar',
-                                   description='foobar', enabled=False)
+        users = ['test1', 'test2']
+        settings = ProjectSettings(
+            name='foo', domain='bar', description='foobar', enabled=False,
+            users=users)
         self.assertEqual('foo', settings.name)
         self.assertEqual('bar', settings.domain_name)
         self.assertEqual('foobar', settings.description)
         self.assertFalse(settings.enabled)
+        self.assertEqual(users, settings.users)
 
     def test_config_all(self):
+        users = ['test1', 'test2']
         settings = ProjectSettings(
             **{'name': 'foo', 'domain': 'bar', 'description': 'foobar',
-               'enabled': False})
+               'enabled': False, 'users': users})
         self.assertEqual('foo', settings.name)
         self.assertEqual('bar', settings.domain_name)
         self.assertEqual('foobar', settings.description)
         self.assertFalse(settings.enabled)
+        self.assertEqual(users, settings.users)
 
 
 class CreateProjectSuccessTests(OSComponentTestCase):