Merge lp:~gz/pyjuju/0.6_default_instance_backport into lp:pyjuju/0.6

[Martin Packman]

Backport correct warning and ignoring behaviour for default-instance-type configuration in openstack.

See the original merge proposal for more details:

<https://code.launchpad.net/~gz/juju/no_default_instance_1069883/+merge/134168>

[Martin Packman (gz)]

Test suite passes with change.

review: Approve

=== modified file 'juju/environment/config.py'
--- juju/environment/config.py	2012-09-20 15:11:08 +0000
+++ juju/environment/config.py	2013-04-02 15:06:25 +0000
@@ -76,7 +76,7 @@
             optional=[
                 "access-key", "secret-key", "auth-url", "project-name",
                 "auth-mode", "region", "use-floating-ip",
-                "ssl-hostname-verification"]),
+                "ssl-hostname-verification", "default-instance-type"]),
         "openstack_s3": KeyDict({
             "control-bucket": String(),
             "admin-secret": String(),
@@ -96,7 +96,8 @@
             optional=[
                 "access-key", "secret-key", "combined-key", "auth-url",
                 "s3-uri", "project-name", "auth-mode", "region",
-                "use-floating-ip", "ssl-hostname-verification"]),
+                "use-floating-ip", "ssl-hostname-verification",
+                "default-instance-type"]),
         "orchestra": KeyDict({
             "orchestra-server": String(),
             "orchestra-user": String(),

=== modified file 'juju/environment/tests/test_config.py'
--- juju/environment/tests/test_config.py	2012-09-27 04:36:51 +0000
+++ juju/environment/tests/test_config.py	2013-04-02 15:06:25 +0000
@@ -67,7 +67,6 @@
      admin-secret: sekret
      control-bucket: container
      default-image-id: 42
-     default-instance-type: m1-sample
      default-series: precise
 """
 

=== modified file 'juju/providers/openstack/launch.py'
--- juju/providers/openstack/launch.py	2012-08-21 16:30:17 +0000
+++ juju/providers/openstack/launch.py	2013-04-02 15:06:25 +0000
@@ -86,7 +86,7 @@
         # Find appropriate instance type for the given constraints. Warn
         # if deprecated is instance-type is being used.
         flavor_name = self._provider.config.get("default-instance-type")
-        if flavor_name is None:
+        if flavor_name is not None:
             log.warning(
                 "default-instance-type is deprecated, use cli --constraints")
         flavors = yield self._provider.nova.list_flavor_details()

=== modified file 'juju/providers/openstack/tests/__init__.py'
--- juju/providers/openstack/tests/__init__.py	2012-08-24 19:22:13 +0000
+++ juju/providers/openstack/tests/__init__.py	2013-04-02 15:06:25 +0000
@@ -100,7 +100,6 @@
             "auth-url": self.api_url,
             "project-name": "test_project",
             "control-bucket": self.environment_name,
-            "default-instance-type": "standard.xsmall",
             "default-image-id": 42,
             "use-floating-ip": True,
             "ssl-hostname-verification": True,
@@ -189,7 +188,6 @@
         "auth-url": api_url,
         "project-name": "aproject",
         "control-bucket": environment_name,
-        "default-instance-type": "standard.xsmall",
         "default-image-id": 42,
         "ssl-hostname-verification": True,
         }

=== modified file 'juju/providers/openstack/tests/test_launch.py'
--- juju/providers/openstack/tests/test_launch.py	2012-09-10 03:20:20 +0000
+++ juju/providers/openstack/tests/test_launch.py	2013-04-02 15:06:25 +0000
@@ -113,6 +113,13 @@
     def get_cc_matcher(self, machine_id, provider, is_master=False):
         return _CloudConfigMatcher(self, machine_id, provider, is_master).match
 
+    def _check_log(self, log, pattern):
+        self.assertRegexpMatches(log.getvalue(), pattern)
+
+    def capture_and_check_log(self, pattern="^$", logname="juju.openstack"):
+        log = self.capture_logging(logname)
+        self.addCleanup(self._check_log, log, pattern)
+
     def test_start_machine_with_constraints(self):
         provider = MockedLaunchProvider(self.mocker)
         provider.expect_zookeeper_machines(1000, "master.invalid")
@@ -126,8 +133,26 @@
                 },
             flavor_id=2)
         self.mocker.replay()
+        self.capture_and_check_log()
         return provider.launch("1", constraints=["cpu=2", "mem=3G"])
 
+    def test_start_machine_with_default_instance_type(self):
+        config = dict(MockedLaunchProvider.default_config)
+        config['default-instance-type'] = "m1.sample"
+        provider = MockedLaunchProvider(self.mocker, config)
+        provider.expect_zookeeper_machines(1000, "master.invalid")
+        provider.expect_launch_setup("1")
+        provider.expect_run_server("1",
+            self.get_cc_matcher("1", provider),
+            response={
+                'id': 1001,
+                'addresses': {'public': []},
+            })
+        self.mocker.replay()
+        self.capture_and_check_log(
+            "^default-instance-type is deprecated.*constraints")
+        return provider.launch("1")
+
     def test_start_machine(self):
         provider = MockedLaunchProvider(self.mocker)
         provider.expect_zookeeper_machines(1000, "master.invalid")
@@ -139,6 +164,7 @@
                 'addresses': {'public': []},
             })
         self.mocker.replay()
+        self.capture_and_check_log()
         return provider.launch("1")
 
     def test_start_machine_delay(self):
@@ -159,6 +185,7 @@
         provider.expect_available_floating_ip(1001)
         self.mocker.result(succeed(None))
         self.mocker.replay()
+        self.capture_and_check_log()
         self.patch(NovaLaunchMachine, "_DELAY_FOR_ADDRESSES", 0)
         return provider.launch("1")
 
@@ -175,6 +202,7 @@
         provider.provider_actions.save_state({'zookeeper-instances': [1000]})
         self.mocker.result(succeed(None))
         self.mocker.replay()
+        self.capture_and_check_log()
         return provider.launch("0", master=True)
 
     def test_start_machine_master(self):