Merge lp:~cjohnston/uci-engine/sshuttle-env-check into lp:uci-engine

[Chris Johnston]

Determine deployment env in order to determine if sshuttle is needed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:572
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/849/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/849/rebuild

review: Approve (continuous-integration)

[Celso Providelo (cprov)]

Looks pretty good!

Although, can't we use yaml.dumps() to write the testing juju files ? I think it would make tests much clear than the text blob.

review: Needs Information

[Chris Johnston (cjohnston)]

Updated.

[lp:~cjohnston/uci-engine/sshuttle-env-check]

573. By Chris Johnston on 2014-06-12

Update tests per review

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:573
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/855/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/855/rebuild

review: Approve (continuous-integration)

[Evan (ev)]

Just need a small fix to one of the tests, but it's otherwise good.

review: Needs Fixing

[lp:~cjohnston/uci-engine/sshuttle-env-check]

574. By Chris Johnston on 2014-06-13

Fix test concerns from ev

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:574
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/862/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/862/rebuild

review: Approve (continuous-integration)

[Celso Providelo (cprov)]

LGTM!

Land it and re-enable integration tests in the new machine, if anything else is needed we can iterate in new MPs.

review: Approve

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-06-11 10:42:39 +0000
+++ juju-deployer/deploy.py	2014-06-13 13:41:35 +0000
@@ -134,23 +134,45 @@
             raise
 
 
+def _get_juju_home():
+    default_home = os.path.join(os.path.expanduser('~'), '.juju')
+    return os.environ.get('JUJU_HOME') or default_home
+
+
+def _get_environments_yaml():
+    juju_home = _get_juju_home()
+    with open(os.path.join(juju_home, 'environments.yaml')) as fp:
+        return yaml.safe_load(fp.read())
+
+
+def _get_juju_env():
+    # Is it in the environment?
+    juju_env = os.environ.get('JUJU_ENV')
+    if juju_env:
+        return juju_env
+
+    # Is it in the current-environment file?
+    juju_home = _get_juju_home()
+    current_env = os.path.join(juju_home, 'current-environment')
+    if os.path.exists(current_env):
+        with open(current_env) as fp:
+            juju_env = fp.read().strip('\n')
+            return juju_env
+
+    # Is it defaulted in the environments.yaml file?
+    juju_env = _get_environments_yaml().get('default')
+    if juju_env:
+        return juju_env
+
+    log.error('No juju environment specified.')
+    sys.exit(1)
+
+
 def _get_control_bucket():
     """Get the name of the bucket in Swift that juju uses for state
     information."""
 
-    default_home = os.path.join(os.path.expanduser('~'), '.juju')
-    juju_home = os.environ.get('JUJU_HOME') or default_home
-
-    with open(os.path.join(juju_home, 'environments.yaml')) as fp:
-        envs = yaml.safe_load(fp.read())
-
-    juju_env = os.environ.get('JUJU_ENV')
-    if juju_env is None:
-        juju_env = envs.get('default')
-    if not juju_env:
-        log.error('No juju environment specified.')
-        sys.exit(1)
-
+    juju_env = _get_juju_env()
     return envs['environments'][juju_env]['control-bucket']
 
 

=== modified file 'juju-deployer/test_deploy.py'
--- juju-deployer/test_deploy.py	2014-06-02 12:27:29 +0000
+++ juju-deployer/test_deploy.py	2014-06-13 13:41:35 +0000
@@ -15,12 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
 import mock
 import tempfile
 import shutil
 import subprocess
 import unittest
+import yaml
 
 from novaclient import exceptions
 import swiftclient
@@ -33,7 +33,7 @@
 
 class TestCheckEnvironment(unittest.TestCase):
 
-    DEFAULT_ENV =  {
+    DEFAULT_ENV = {
         'OS_USERNAME': 'os-user',
         'OS_AUTH_URL': 'something.stack',
         'CI_OAUTH_CONSUMER_KEY': 'key',
@@ -156,6 +156,7 @@
     @mock.patch('ci_utils.sourcecode.update_sourcecode')
     def test_install_deployer(self, mocked_us):
         fixtures.isolate_from_env(self, dict(PYTHONPATH=''))
+
         def local_us(*args, **kwargs):
             os.makedirs('juju-deployer/.bzr')
         mocked_us.side_effect = local_us
@@ -459,5 +460,51 @@
                 dcb.assert_called_with()
 
 
+class TestGetEnvironment(unittest.TestCase):
+    def setUp(self):
+        super(TestGetEnvironment, self).setUp()
+        fixtures.set_uniq_cwd(self)
+        fixtures.isolate_from_env(
+            self, dict(HOME=self.uniq_dir, JUJU_HOME=None, JUJU_ENV=None))
+        os.mkdir('.juju')
+        self.juju_home = os.path.join(os.environ['HOME'], '.juju')
+
+    def test_get_juju_home(self):
+        juju_home = '~/.juju/'
+        os.environ['JUJU_HOME'] = juju_home
+        self.assertEquals(juju_home, deploy._get_juju_home())
+
+    def test_get_juju_home_unset(self):
+        self.assertEquals(self.juju_home, deploy._get_juju_home())
+
+    def test_get_juju_env_os_environ_set(self):
+        env = 'hp'
+        os.environ['JUJU_ENV'] = env
+        self.assertEquals(env, deploy._get_juju_env())
+
+    def test_get_juju_env_current_env(self):
+        env = 'hpcloud'
+        with open(os.path.join(
+                  self.juju_home, 'current-environment'), 'w') as fp:
+            fp.write(env)
+        self.assertEquals(env, deploy._get_juju_env())
+
+    def test_get_juju_env_default(self):
+        env = {
+            'default': 'hp',
+            'environments': {
+                'hp': {
+                    'type': 'openstack',
+                    'default-series': 'precise',
+                    'use-floating-ip': False,
+                },
+            },
+        }
+        with open(os.path.join(
+                  self.juju_home, 'environments.yaml'), 'w') as f:
+            yaml.safe_dump(env, f)
+        self.assertEquals('hp', deploy._get_juju_env())
+
+
 if __name__ == '__main__':
     unittest.main()

=== modified file 'juju-deployer/test_run.py'
--- juju-deployer/test_run.py	2014-04-16 18:36:03 +0000
+++ juju-deployer/test_run.py	2014-06-13 13:41:35 +0000
@@ -31,7 +31,7 @@
 logging.disable(logging.CRITICAL)
 
 mydir = os.path.dirname(__file__)
-sys.path.append(os.path.abspath(os.path.join( mydir, '..', 'tests')))
+sys.path.append(os.path.abspath(os.path.join(mydir, '..', 'tests')))
 import run
 
 
@@ -142,5 +142,44 @@
         self.assertEqual(result, ['ci-juju-gui/0'])
 
 
+class TestFloatingIP(unittest.TestCase):
+
+    def setUp(self):
+        super(TestFloatingIP, self).setUp()
+        fixtures.set_uniq_cwd(self)
+        fixtures.isolate_from_env(self, dict(HOME=self.uniq_dir))
+        os.mkdir('.juju')
+
+    def test_with_floating_ip(self):
+        env = {
+            'default': 'hp',
+            'environments': {
+                'hp': {
+                    'type': 'openstack',
+                    'default-series': 'precise',
+                    'use-floating-ip': True,
+                },
+            },
+        }
+        with open('.juju/environments.yaml', 'w') as f:
+            yaml.safe_dump(env, f)
+        self.assertTrue(run.floating_ip_env())
+
+    def test_without_floating_ip(self):
+        env = {
+            'default': 'hp',
+            'environments': {
+                'hp': {
+                    'type': 'openstack',
+                    'default-series': 'precise',
+                    'use-floating-ip': False,
+                },
+            },
+        }
+        with open('.juju/environments.yaml', 'w') as f:
+            yaml.safe_dump(env, f)
+        self.assertFalse(run.floating_ip_env())
+
+
 if __name__ == '__main__':
     unittest.main()

=== modified file 'tests/run.py'
--- tests/run.py	2014-06-10 10:23:19 +0000
+++ tests/run.py	2014-06-13 13:41:35 +0000
@@ -171,6 +171,11 @@
     subprocess.check_call(cmd)
 
 
+def floating_ip_env():
+    juju_env = deploy._get_juju_env()
+    juju_yaml = deploy._get_environments_yaml()
+    return juju_yaml['environments'][juju_env].get('use-floating-ip') == True
+
 def check_sudoers(sudoers_path=SUDOERS_FILE):
     """Check to see if /etc/sudoers.d/sshuttle exists and is of the right
     form."""
@@ -234,7 +239,7 @@
         log.error(msg)
         sys.exit(1)
 
-    if not check_sudoers():
+    if not floating_ip_env() and not check_sudoers():
         msg = 'Please run:\necho "$USER %s" > %s' % (SUDOERS, SUDOERS_FILE)
         log.error(msg)
         sys.exit(1)