Merge lp:~therve/pyjuju/rapi-uuid into lp:~hazmat/pyjuju/rapi-rollup

[Kapil Thangavelu]

The branch merges the changes from trunk including the new environment UUID, and expose that UUID in the first API message.

[edit to point api rollup branch]

[Kapil Thangavelu (hazmat)]

looks good thanks.

review: Approve

=== removed directory 'examples'
=== removed file 'examples/README'
--- examples/README	2011-09-29 21:11:51 +0000
+++ examples/README	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Examples
-========
-
-
-These are some example charms that can be deployed together to create some connected services.
-
-Many more charms of greater functionality and utility exist in the Principia project, which
-currently serves as a clearinghouse for juju charms.
-
-http://launchpad.net/principia
-
-
-Deploying
-=========
-
-As an example of deploying these sample charms as services and connectinng them.
-
-  $ juju bootstrap
-  $ juju deploy --repository=examples local:mysql
-  $ juju deploy --repository=examples local:wordpress
-  $ juju add-relation wordpress mysql
-  $ juju status
-
-The status command will show the address of the newly deployed wordpress service.

=== removed directory 'examples/precise'
=== removed directory 'examples/precise/mysql'
=== removed file 'examples/precise/mysql/config.yaml'
--- examples/precise/mysql/config.yaml	2011-06-13 20:33:35 +0000
+++ examples/precise/mysql/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-options: {}

=== removed directory 'examples/precise/mysql/hooks'
=== removed file 'examples/precise/mysql/hooks/db-relation-joined'
--- examples/precise/mysql/hooks/db-relation-joined	2011-09-30 18:52:52 +0000
+++ examples/precise/mysql/hooks/db-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-hostname=`unit-get private-address`
-
-# Get the mysql password that was generated by the install hook
-password=`cat /var/lib/juju/mysql.passwd`
-
-# Get the database name; this takes a service unit (ex: wordpress/0)
-# and extracts just 'wordpress'
-service=`echo $JUJU_REMOTE_UNIT | cut -d/ -f1` # split on /
-
-# Determine if a database needs to be created for this service
-existing_databases=`mysql --password="$password" --silent --execute 'show databases'`
-for db in $existing_databases; do
-    if [ "$db" = "$service" ] ; then
-        juju-log "Database already exists, publishing details and exiting"
-        service_password=`cat /var/lib/juju/$service.passwd`
-        # Save these settings on the relation; this will trigger the remote
-        # service unit
-        relation-set database="$service" user="$service" password="$service_password"
-        exit 0 # database already exists
-    fi
-done
-
-# Generate a strong password for the database, using /dev/urandom
-service_password=`pwgen 10 1`
-# Store service password, new service units of same service would need it
-echo $service_password >> /var/lib/juju/$service.passwd
-
-# Create new database and corresponding security settings
-juju-log "Creating new database and corresponding security settings"
-mysqladmin --password="$password" create "$service"
-echo "grant all on $service.* to $service identified by '$service_password'" | mysql --password="$password" --database="$service"
-mysqladmin --password="$password" flush-privileges
-
-# Save these settings on the relation; this will trigger the remote
-# service unit
-relation-set database="$service" user="$service" password="$service_password"

=== removed file 'examples/precise/mysql/hooks/install'
--- examples/precise/mysql/hooks/install	2012-08-22 23:20:44 +0000
+++ examples/precise/mysql/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get install -qqy debconf-utils python-mysqldb pwgen
-
-# Generate a strong password for the mysql service, using /dev/urandom
-PASSWORD=`pwgen 10 1`
-
-# Store the password for later use by the db-relation-changed hook for
-# this service unit. As a general note, for data that service units do
-# not need to share, simply use the machine's local file store.
-PASSFILE=/var/lib/juju/mysql.passwd
-if ! [ -f $PASSFILE ] ; then
-  touch $PASSFILE
-fi
-chmod 0600 $PASSFILE
-if ! [ -s $PASSFILE ] ; then
-  echo $PASSWORD >> /var/lib/juju/mysql.passwd
-fi
-
-echo mysql-server-5.1 mysql-server/root_password password $PASSWORD | debconf-set-selections
-echo mysql-server-5.1 mysql-server/root_password_again password $PASSWORD | debconf-set-selections
-
-juju-log "mysql-server settings preseeded, now installing via apt-get"
-DEBIAN_FRONTEND=noninteractive apt-get -y install -qq mysql-server
-
-juju-log "Editing my.cnf to allow listening on all interfaces"
-sed --in-place=old 's/127\.0\.0\.1/0.0.0.0/' /etc/mysql/my.cnf
-
-juju-log "Stopping mysql service"
-service mysql stop

=== removed file 'examples/precise/mysql/hooks/start'
--- examples/precise/mysql/hooks/start	2011-11-28 16:29:37 +0000
+++ examples/precise/mysql/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Starting mysql service"
-service mysql start || service mysql restart

=== removed file 'examples/precise/mysql/hooks/stop'
--- examples/precise/mysql/hooks/stop	2011-11-28 16:29:37 +0000
+++ examples/precise/mysql/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping mysql service"
-service mysql stop || true

=== removed file 'examples/precise/mysql/metadata.yaml'
--- examples/precise/mysql/metadata.yaml	2011-10-04 19:35:07 +0000
+++ examples/precise/mysql/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-name: mysql
-summary: "MySQL relational database provider"
-description: |
-    Installs and configures the MySQL package (mysqldb), then runs it.
-
-    Upon a consuming service establishing a relation, creates a new
-    database for that service, if the database does not yet
-    exist. Publishes the following relation settings for consuming
-    services:
-
-      database: database name
-      user: user name to access database
-      password: password to access the database
-      host: local hostname
-provides:
-  db:
-    interface: mysql

=== removed file 'examples/precise/mysql/revision'
--- examples/precise/mysql/revision	2011-10-04 19:35:07 +0000
+++ examples/precise/mysql/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-11

=== removed directory 'examples/precise/php'
=== removed file 'examples/precise/php/config.yaml'
--- examples/precise/php/config.yaml	2011-08-30 21:38:19 +0000
+++ examples/precise/php/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-options:
-  application_file:
-    description: An application file to push.
-    type: string
-

=== removed directory 'examples/precise/php/hooks'
=== removed file 'examples/precise/php/hooks/config-changed'
--- examples/precise/php/hooks/config-changed	2011-09-30 18:54:44 +0000
+++ examples/precise/php/hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-hostname=`unit-get public-address`
-
-app_dir="/var/www/$hostname/"
-app_file=`config-get application_file`
-
-if [ -z $app_file ]; then
-    exit 0
-fi
-
-echo "$app_file" > $app_dir/index.php
-chmod a+r $app_dir/index.php
-

=== removed file 'examples/precise/php/hooks/install'
--- examples/precise/php/hooks/install	2011-09-30 18:54:44 +0000
+++ examples/precise/php/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-juju-log "Installing php5 via apt-get"
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get -y install php5
-
-# Create an internal secret key for wordpress; this is unrelated to
-# the password generated for the admin user of wordpress
-hostname=`unit-get public-address`
-
-SITE_PATH="/var/www/$hostname"
-
-
-juju-log "Creating appropriate upload paths and directories"
-# Setup appropriate upload paths and directories
-mkdir -p $SITE_PATH
-chown -R root:www-data $SITE_PATH
-chmod -R a+rw $SITE_PATH
-chmod a+x $SITE_PATH
-
-# Write the apache config
-# XXX a future branch will change this to use augtool
-apache_config_file_path="/etc/apache2/sites-available/$hostname"
-juju-log "Writing apache config file $apache_config_file_path"
-cat > $apache_config_file_path <<EOF
-<VirtualHost *:80>
-  ServerName $hostname
-  DocumentRoot /var/www/$hostname
-  Options All
-  ErrorLog /var/log/apache2/$hostname-error.log
-  TransferLog /var/log/apache2/$hostname-access.log
-  <FilesMatch \.php$>
-    SetHandler application/x-httpd-php
-  </FilesMatch>
-</VirtualHost>
-EOF
-chmod 0644 $apache_config_file_path
-
-# Configure apache
-juju-log "Enabling apache modules: rewrite, vhost_alias"
-a2enmod rewrite
-a2enmod vhost_alias
-juju-log "Enabling apache site: $hostname"
-a2ensite $hostname
-
-# Restart apache
-juju-log "Restarting apache2 service"
-/etc/init.d/apache2 restart

=== removed file 'examples/precise/php/hooks/start'
--- examples/precise/php/hooks/start	2011-07-01 11:40:20 +0000
+++ examples/precise/php/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#!/bin/bash

=== removed file 'examples/precise/php/hooks/stop'
--- examples/precise/php/hooks/stop	2011-09-15 18:56:08 +0000
+++ examples/precise/php/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping apache"
-/etc/init.d/apache2 stop

=== removed file 'examples/precise/php/metadata.yaml'
--- examples/precise/php/metadata.yaml	2011-10-04 19:35:07 +0000
+++ examples/precise/php/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-name: php
-summary: "php container"
-description: |
-  PHP environment for your code.

=== removed file 'examples/precise/php/revision'
--- examples/precise/php/revision	2011-10-04 19:35:07 +0000
+++ examples/precise/php/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-5

=== removed directory 'examples/precise/recorder'
=== removed directory 'examples/precise/recorder/hooks'
=== removed file 'examples/precise/recorder/hooks/install'
--- examples/precise/recorder/hooks/install	2012-06-22 04:24:34 +0000
+++ examples/precise/recorder/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-# for testing
-open-port 8080
\ No newline at end of file

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-changed'
--- examples/precise/recorder/hooks/juju-info-relation-changed	2012-03-21 12:54:28 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -x
-
-juju-log "Changed relation with $JUJU_REMOTE_UNIT"
-juju-log `relation-list`

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-departed'
--- examples/precise/recorder/hooks/juju-info-relation-departed	2012-03-21 12:54:28 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-departed	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-juju-log "Departed from $JUJU_REMOTE_UNIT"

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-joined'
--- examples/precise/recorder/hooks/juju-info-relation-joined	2012-03-21 12:54:28 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -x
-
-juju-log "Joined with $JUJU_REMOTE_UNIT"
-juju-log `relation-list`

=== removed file 'examples/precise/recorder/metadata.yaml'
--- examples/precise/recorder/metadata.yaml	2012-03-14 22:07:28 +0000
+++ examples/precise/recorder/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-name: recorder
-summary: "Subordinate test charm"
-description: |
-    Records which units can see each other to show how subordinates work.
-subordinate: true
-requires:
-    juju-info:
-        interface: juju-info
-        scope: container

=== removed file 'examples/precise/recorder/revision'
--- examples/precise/recorder/revision	2012-03-14 22:07:28 +0000
+++ examples/precise/recorder/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1
\ No newline at end of file

=== removed directory 'examples/precise/wordpress'
=== removed file 'examples/precise/wordpress/config.yaml'
--- examples/precise/wordpress/config.yaml	2011-08-30 21:38:19 +0000
+++ examples/precise/wordpress/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-options:
-  plugin:
-    description: |
-      The URL of a wordpress plugin which will be installed and made available in the Admin UI.
-      http://downloads.wordpress.org/plugin/buddypress.1.2.8.zip is a valid example.
-    type: string
-

=== removed directory 'examples/precise/wordpress/hooks'
=== removed file 'examples/precise/wordpress/hooks/config-changed'
--- examples/precise/wordpress/hooks/config-changed	2011-09-30 18:52:52 +0000
+++ examples/precise/wordpress/hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-hostname=`unit-get public-address`
-plugin_dir="/var/www/$hostname/wp-content/plugins"
-plugin_url=`config-get plugin`
-
-base_plugin=`basename ${plugin_url}`
-
-cd /tmp
-
-curl -O ${plugin_url}
-
-if [ $? = 0 ]; then
-    cd ${plugin_dir}
-    unzip /tmp/${base_plugin}
-else
-    juju-log -l WARNING "Unable to fetch ${plugin_url}"
-
-fi

=== removed file 'examples/precise/wordpress/hooks/db-relation-changed'
--- examples/precise/wordpress/hooks/db-relation-changed	2011-09-30 18:52:52 +0000
+++ examples/precise/wordpress/hooks/db-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-UPLOAD_PATH="/var/www/wp-uploads"
-
-hostname=`unit-get public-address`
-juju-log "Retrieved hostname: $hostname"
-
-# Check we haven't already been setup.
-config_file_path="/etc/wordpress/config-$hostname.php"
-if [ -f "$config_file_path" ] ; then
-    juju-log "Wordpress for site $config_file_path already Configured, exiting"
-    echo "Already Configured, Exiting"
-    exit 0 # already setup
-fi
-
-# Get the database settings; if not set, wait for this hook to be
-# invoked again
-database=`relation-get database`
-if [ -z "$database" ] ; then
-    exit 0 # wait for future handshake from database service unit
-fi
-
-# Our protocol on this interface ensures that all or none of the
-# settings are set. But we can verify the setting or the values if
-# more error checking if desired.
-user=`relation-get user`
-password=`relation-get password`
-host=`relation-get private-address`
-
-# Create an internal secret key for wordpress; this is unrelated to
-# the password generated for the admin user of wordpress
-secret_key=`pwgen 10 1`
-
-juju-log "Creating appropriate upload paths and directories"
-# Setup appropriate upload paths and directories
-ln -s /usr/share/wordpress "/var/www/$hostname"
-mkdir -p $UPLOAD_PATH
-mkdir -p "$UPLOAD_PATH/$hostname"
-chown -R root:www-data $UPLOAD_PATH
-chmod 0744 $UPLOAD_PATH
-chmod 0770 "$UPLOAD_PATH/$hostname"
-chown -R root:www-data "/var/www/$hostname/wp-content"
-
-juju-log "Writing wordpress config file $config_file_path"
-# Write the wordpress config
-cat > $config_file_path <<EOF
-<?php
-define('DB_NAME', '$database');
-define('DB_USER', '$user');
-define('DB_PASSWORD', '$password');
-define('DB_HOST', '$host');
-define('SECRET_KEY', '$secret_key');
-
-#This will disable the update notification.
-define('WP_CORE_UPDATE', false);
-
-\$table_prefix  = 'wp_';
-\$server = '$host';
-\$loginsql = '$user';
-\$passsql = '$password';
-\$base = '$database';
-\$upload_path = '/var/www/wp-uploads/$hostname';
-\$upload_url_path = 'http://$hostname/wp-uploads';
-?>
-EOF
-chmod 0644 $config_file_path
-
-# Write the apache config
-# XXX a future branch will change this to use augtool
-apache_config_file_path="/etc/apache2/sites-available/$hostname"
-juju-log "Writing apache config file $apache_config_file_path"
-cat > $apache_config_file_path <<EOF
-<VirtualHost *:80>
-  ServerName $hostname
-  DocumentRoot /var/www/$hostname
-  Options All
-  ErrorLog /var/log/apache2/wp-error.log
-  TransferLog /var/log/apache2/wp-access.log
-  # Store uploads in /var/www/wp-uploads/$0
-  RewriteEngine On
-  RewriteRule ^/wp-uploads/(.*)$ /var/www/wp-uploads/%%{HTTP_HOST}/\$1
-</VirtualHost>
-EOF
-chmod 0644 $apache_config_file_path
-
-# Configure apache
-juju-log "Enabling apache modules: rewrite, vhost_alias"
-a2enmod rewrite
-a2enmod vhost_alias
-juju-log "Enabling apache site: $hostname"
-a2ensite $hostname
-
-# Restart apache
-juju-log "Restarting apache2 service"
-/etc/init.d/apache2 restart
-
-# Make it publicly visible, once the wordpress service is exposed
-open-port 80/tcp

=== removed file 'examples/precise/wordpress/hooks/install'
--- examples/precise/wordpress/hooks/install	2011-09-30 01:46:14 +0000
+++ examples/precise/wordpress/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-juju-log "Installing wordpress, pwgen via apt-get"
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get -y install wordpress pwgen unzip

=== removed file 'examples/precise/wordpress/hooks/start'
--- examples/precise/wordpress/hooks/start	2011-02-03 01:23:43 +0000
+++ examples/precise/wordpress/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#!/bin/bash

=== removed file 'examples/precise/wordpress/hooks/stop'
--- examples/precise/wordpress/hooks/stop	2011-09-15 18:56:08 +0000
+++ examples/precise/wordpress/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping apache"
-/etc/init.d/apache2 stop

=== removed file 'examples/precise/wordpress/metadata.yaml'
--- examples/precise/wordpress/metadata.yaml	2011-10-04 19:35:07 +0000
+++ examples/precise/wordpress/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-name: wordpress
-summary: "WordPress blog"
-description: |
-    Installs WordPress package (wordpress). Upon the database provider
-    providing the required database, and the relation settings
-    necessary to access it, completes the configuration of WordPress
-    and makes it available on the web.
-requires:
-  db:
-    interface: mysql

=== removed file 'examples/precise/wordpress/revision'
--- examples/precise/wordpress/revision	2011-10-04 19:35:07 +0000
+++ examples/precise/wordpress/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-31

=== modified file 'juju/agents/api.py'
--- juju/agents/api.py	2012-12-18 01:15:02 +0000
+++ juju/agents/api.py	2013-01-17 11:10:30 +0000
@@ -50,10 +50,11 @@
 
         self.environment = yield self.configure_environment()
         self.provider = yield self._get_provider()
+        env_uuid = yield self.global_settings_state.get_environment_id()
         log.debug("Received environment data.")
         root = Data("Juju API Server\n", "text/plain")
         self.ws_factory = WebSocketAPIFactory(
-            self.config['zookeeper_servers'], self.provider)
+            self.config['zookeeper_servers'], self.provider, env_uuid)
         yield self.ws_factory.startFactory()
 
         root.putChild('ws', WebSocketsResource(self.ws_factory))
@@ -151,7 +152,7 @@
             "--port", default=default_port, type=int)
         parser.add_argument("--secure", action='store_true')
         parser.add_argument("--keys", default=os.getenv('JUJU_API_KEYS'),
-            type=keys_directory, metavar='PATH')
+                            type=keys_directory, metavar='PATH')
         return parser
 
 if __name__ == '__main__':

=== modified file 'juju/agents/tests/test_unit.py'
--- juju/agents/tests/test_unit.py	2012-09-10 03:20:20 +0000
+++ juju/agents/tests/test_unit.py	2013-01-17 11:10:30 +0000
@@ -35,6 +35,7 @@
         yield settings.set_provider_type("dummy")
         self.change_environment(
             PATH=get_cli_environ_path(),
+            JUJU_ENV_UUID="snowflake",
             JUJU_UNIT_NAME="mysql/0")
 
     @inlineCallbacks

=== modified file 'juju/charm/tests/test_directory.py'
--- juju/charm/tests/test_directory.py	2012-09-14 15:33:33 +0000
+++ juju/charm/tests/test_directory.py	2013-01-17 11:10:30 +0000
@@ -3,7 +3,6 @@
 import hashlib
 import inspect
 import shutil
-import tempfile
 import zipfile
 
 from juju.errors import CharmError, FileNotFound
@@ -111,12 +110,12 @@
     def test_make_archive(self):
         # make archive from sample directory
         directory = CharmDirectory(sample_directory)
-        f = tempfile.NamedTemporaryFile(suffix=".charm")
-        directory.make_archive(f.name)
+        f = self.makeFile(suffix=".charm")
+        directory.make_archive(f)
 
         # open archive in .zip-format and assert integrity
         from zipfile import ZipFile
-        zf = ZipFile(f.name)
+        zf = ZipFile(f)
         self.assertEqual(zf.testzip(), None)
 
         # assert included
@@ -212,7 +211,8 @@
 
     def test_internal_symlink(self):
         charm_path = self.copy_charm()
-        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+        external_file = self.makeFile(content='baz')
+        os.symlink(external_file, os.path.join(charm_path, "foobar"))
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)
@@ -220,7 +220,8 @@
 
     def test_extract_symlink(self):
         charm_path = self.copy_charm()
-        os.symlink("/etc/lsb-release", os.path.join(charm_path, "foobar"))
+        external_file = self.makeFile(content='lorem ipsum')
+        os.symlink(external_file, os.path.join(charm_path, "foobar"))
 
         directory = CharmDirectory(charm_path)
         e = self.assertRaises(InvalidCharmFile, directory.as_bundle)

=== modified file 'juju/environment/config.py'
--- juju/environment/config.py	2012-09-20 15:11:08 +0000
+++ juju/environment/config.py	2013-01-17 11:10:30 +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-01-17 11:10:30 +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/hooks/invoker.py'
--- juju/hooks/invoker.py	2012-09-28 16:22:27 +0000
+++ juju/hooks/invoker.py	2013-01-17 11:10:30 +0000
@@ -50,7 +50,7 @@
         exit_code = reason.value.exitCode
         if exit_code == 0:
             return deferred.callback(exit_code)
-        elif exit_code == None and reason.value.signal:
+        elif exit_code is None and reason.value.signal:
             error = errors.CharmInvocationError(
                 self._hook_name, exit_code, signal=reason.value.signal)
         else:
@@ -215,6 +215,7 @@
                     JUJU_CLIENT_ID=self._client_id,
                     CHARM_DIR=os.path.join(self._unit_path, "charm"),
                     _JUJU_CHARM_FORMAT=str(self.charm_format),
+                    JUJU_ENV_UUID=os.environ["JUJU_ENV_UUID"],
                     JUJU_UNIT_NAME=os.environ["JUJU_UNIT_NAME"],
                     DEBIAN_FRONTEND="noninteractive",
                     APT_LISTCHANGES_FRONTEND="none",
@@ -234,8 +235,8 @@
         """Returns the hook context for the invocation."""
         return self._context
 
-    def get_relation_hook_context(self, relation_ident):
-        """Returns a hook context corresponding to `relation_ident`"""
+    def get_cached_relation_hook_context(self, relation_ident):
+        """Returns cached hook context corresponding to `relation_ident`"""
         try:
             return self._relation_contexts[relation_ident]
         except KeyError:
@@ -255,7 +256,7 @@
 
         if not os.access(hook_filename, os.X_OK):
             raise errors.CharmError(hook_filename,
-                                      "hook is not executable")
+                                    "hook is not executable")
 
     def send_signal(self, signal_id):
         """Send a signal of the given signal_id.

=== modified file 'juju/hooks/protocol.py'
--- juju/hooks/protocol.py	2012-09-28 16:22:27 +0000
+++ juju/hooks/protocol.py	2013-01-17 11:10:30 +0000
@@ -206,7 +206,7 @@
         if relation_id:
             yield self.factory.log(
                 logging.DEBUG, "Getting relation %s" % relation_id)
-            context = yield invoker.get_relation_hook_context(relation_id)
+            context = invoker.get_cached_relation_hook_context(relation_id)
         require_relation_context(context)
 
         try:
@@ -238,7 +238,7 @@
         if relation_id:
             yield self.factory.log(
                 logging.DEBUG, "Setting relation %s" % relation_id)
-            context = yield invoker.get_relation_hook_context(relation_id)
+            context = invoker.get_cached_relation_hook_context(relation_id)
         require_relation_context(context)
 
         for k, v in data.items():
@@ -256,8 +256,8 @@
         if relation_id:
             yield self.factory.log(
                 logging.DEBUG, "Listing relation members for %s" % relation_id)
-            context = yield self.factory.get_invoker(client_id).\
-                get_relation_hook_context(relation_id)
+            invoker = yield self.factory.get_invoker(client_id)
+            context = invoker.get_cached_relation_hook_context(relation_id)
         require_relation_context(context)
         members = yield context.get_members()
         defer.returnValue(dict(members=" ".join(members)))
@@ -265,7 +265,7 @@
     @RelationIdsCommand.responder
     @defer.inlineCallbacks
     def relation_ids(self, client_id, relation_name):
-        """Set values into state.hook.RelationHookContext.
+        """Get relation idents for this hook context.
 
         :client_id: hooks client id that is used to define a context
            for a consistent view of state.

=== modified file 'juju/hooks/tests/test_executor.py'
--- juju/hooks/tests/test_executor.py	2011-09-15 18:50:23 +0000
+++ juju/hooks/tests/test_executor.py	2013-01-17 11:10:30 +0000
@@ -207,7 +207,9 @@
         log = logging.getLogger("invoker")
         # Populate environment variables for default invoker.
         self.change_environment(
-            JUJU_UNIT_NAME="dummy/1", PATH="/bin/:/usr/bin")
+            JUJU_UNIT_NAME="dummy/1",
+            JUJU_ENV_UUID="snowflake",
+            PATH="/bin/:/usr/bin")
         output = self.capture_logging("invoker", level=logging.DEBUG)
         invoker = Invoker(
             None, None, "constant", self.makeFile(), unit_dir, log)

=== modified file 'juju/hooks/tests/test_invoker.py'
--- juju/hooks/tests/test_invoker.py	2012-10-01 03:44:42 +0000
+++ juju/hooks/tests/test_invoker.py	2013-01-17 11:10:30 +0000
@@ -178,6 +178,7 @@
             "hooks")
         self.change_environment(
             PATH=get_cli_environ_path(test_hook_path, "/usr/bin", "/bin"),
+            JUJU_ENV_UUID="snowflake",
             JUJU_UNIT_NAME=local_unit,
             JUJU_REMOTE_UNIT=remote_unit)
 
@@ -268,8 +269,8 @@
             state["relations"]["mysql"][0])
         wpr = yield self.relation_state_manager.get_relations_for_service(
             state["services"]["wordpress"])
-        wpr = [r for r in wpr if r.internal_relation_id == \
-                 self.mysql_relation.internal_relation_id][0]
+        wpr = [r for r in wpr if r.internal_relation_id ==
+               self.mysql_relation.internal_relation_id][0]
         self.wordpress_relation = yield wpr.add_unit_state(
             state["relations"]["wordpress"][0])
 
@@ -289,9 +290,10 @@
         yield self.wordpress_relation.set_data({"hello": "world"})
 
         hook_log = self.capture_logging("hook")
-        exe = yield self.ua.get_invoker("db:42", "add", "mysql/0",
-                                  self.mysql_relation,
-                                  client_id="client_id")
+        exe = yield self.ua.get_invoker(
+            "db:42", "add", "mysql/0",
+            self.mysql_relation,
+            client_id="client_id")
 
         yield exe(self.create_hook(
             "relation-get", "--format=json - wordpress/0"))
@@ -542,6 +544,7 @@
         # dummy charm (this is the default charm used when the
         # add_service method is use)
         self.assertEqual(env["_JUJU_CHARM_FORMAT"], "1")
+        self.assertEqual(env["JUJU_ENV_UUID"], "snowflake")
 
     @defer.inlineCallbacks
     def test_missing_hook(self):
@@ -1016,7 +1019,7 @@
         self.assertEqual(
             implied,
             self.ua.server_factory.get_invoker("client_id").\
-                get_relation_hook_context("db:0"))
+                get_cached_relation_hook_context("db:0"))
         self.assertEqual(
             set((yield implied.get_relation_idents("db"))),
             set(["db:0", "db:1"]))
@@ -1031,32 +1034,32 @@
         # Add another relation, verify it's not yet visible
         yield self.add_a_blog("wordpress3")
 
-        db0 = yield exe.get_relation_hook_context("db:0")
-        db1 = yield exe.get_relation_hook_context("db:1")
+        db0 = exe.get_cached_relation_hook_context("db:0")
+        db1 = exe.get_cached_relation_hook_context("db:1")
         self.assertEqual(db1.relation_ident, "db:1")
         self.assertEqual(
             set((yield db1.get_relation_idents("db"))),
             set(["db:0", "db:1"]))
         self.assertEqual(
             db1,
-            exe.get_relation_hook_context("db:1"))
+            exe.get_cached_relation_hook_context("db:1"))
 
         # Not yet visible relation
         self.assertRaises(
             RelationStateNotFound,
-            exe.get_relation_hook_context, "db:2")
+            exe.get_cached_relation_hook_context, "db:2")
 
         # Nonexistent relation idents
         self.assertRaises(
             RelationStateNotFound,
-            exe.get_relation_hook_context, "db:12345")
+            exe.get_cached_relation_hook_context, "db:12345")
 
         # Reread parent and child contexts
         exe = yield self.ua.get_invoker(
             "db:0", "add", "mysql/0", self.relation, client_id="client_id")
         db0 = yield exe.get_context()
-        db1 = yield exe.get_relation_hook_context("db:1")
-        db2 = yield exe.get_relation_hook_context("db:2")
+        db1 = exe.get_cached_relation_hook_context("db:1")
+        db2 = exe.get_cached_relation_hook_context("db:2")
 
         # Verify that any changes are written out; write directly here
         # using the relation contexts
@@ -1107,9 +1110,9 @@
             set((yield exe.get_context().get_relation_idents("db"))),
             set(["db:0", "db:1", "db:2"]))
 
-        db0 = yield exe.get_relation_hook_context("db:0")
-        db1 = yield exe.get_relation_hook_context("db:1")
-        db2 = yield exe.get_relation_hook_context("db:2")
+        db0 = exe.get_cached_relation_hook_context("db:0")
+        db1 = exe.get_cached_relation_hook_context("db:1")
+        db2 = exe.get_cached_relation_hook_context("db:2")
 
         # Verify that any changes are written out; write directly here
         # using the relation contexts
@@ -1152,8 +1155,9 @@
         self.assertEqual(
             set((yield exe.get_context().get_relation_idents("db"))),
             set(["db:0", "db:2"]))
-        yield self.assertFailure((yield exe.get_relation_hook_context("db:1")),
-                                 RelationStateNotFound)
+        yield self.assertRaises(
+            RelationStateNotFound,
+            exe.get_cached_relation_hook_context, "db:1")
 
     @defer.inlineCallbacks
     def test_relation_ids(self):
@@ -1288,7 +1292,7 @@
         self.assertEqual(result, 0)
         yield exe.ended
 
-        db1 = exe.get_relation_hook_context("db:1")
+        db1 = exe.get_cached_relation_hook_context("db:1")
         yield self.assert_zk_data(db1, {
                 "a": "42",
                 "b": "xyz",
@@ -1363,7 +1367,7 @@
             client_id="client_id")
 
         # First set through the context
-        db1 = exe.get_relation_hook_context("db:1")
+        db1 = exe.get_cached_relation_hook_context("db:1")
         yield db1.set({"name": "whiterabbit"})
 
         # Then get from db:1

=== modified file 'juju/machine/tests/data/test_get_container'
--- juju/machine/tests/data/test_get_container	2012-10-09 18:55:55 +0000
+++ juju/machine/tests/data/test_get_container	2013-01-17 11:10:30 +0000
@@ -25,6 +25,8 @@
     respawn
 
 
+    env JUJU_ENV_UUID="snowflake"
+
     env JUJU_HOME="/var/lib/juju"
 
     env JUJU_MACHINE_ID="None"

=== modified file 'juju/machine/tests/test_unit_deployment.py'
--- juju/machine/tests/test_unit_deployment.py	2012-10-05 13:55:09 +0000
+++ juju/machine/tests/test_unit_deployment.py	2013-01-17 11:10:30 +0000
@@ -23,6 +23,7 @@
 
 DATA_DIR = os.path.join(os.path.dirname(inspect.getabsfile(tests)), "data")
 
+
 class UnitMachineDeploymentTest(RepositoryTestBase):
 
     def setUp(self):
@@ -110,7 +111,7 @@
         self.mocker.replay()
 
         d = self.deployment.start(
-            "123", get_test_zookeeper_address(), self.bundle)
+            "snowflake", "123", get_test_zookeeper_address(), self.bundle)
 
         def verify_upstart(_):
             conf_path = os.path.join(self.init_dir, "juju-wordpress-0.conf")
@@ -130,6 +131,7 @@
                 "JUJU_HOME": self.juju_directory,
                 "JUJU_UNIT_NAME": self.unit_name,
                 "JUJU_ZOOKEEPER": get_test_zookeeper_address(),
+                "JUJU_ENV_UUID": "snowflake",
                 "JUJU_MACHINE_ID": "123"})
 
             log_file = os.path.join(
@@ -158,7 +160,7 @@
         self.mocker.replay()
 
         yield self.deployment.start(
-            "0", get_test_zookeeper_address(), self.bundle)
+            "snowflake", "0", get_test_zookeeper_address(), self.bundle)
 
         yield self.deployment.destroy()
         self.assertFalse(os.path.exists(self.deployment.directory))
@@ -190,7 +192,7 @@
         self.mocker.replay()
 
         yield self.deployment.start(
-            "0", get_test_zookeeper_address(), self.bundle)
+            "snowflake", "0", get_test_zookeeper_address(), self.bundle)
         yield self.deployment.destroy()
         self.assertFalse(os.path.exists(self.deployment.directory))
 
@@ -263,7 +265,7 @@
         # "unpatch" to use real /etc/init
         self.patch(UpstartService, "init_dir", self.real_init_dir)
         yield self.deployment.start(
-            "0", get_test_zookeeper_address(), self.bundle)
+            "snowflake", "0", get_test_zookeeper_address(), self.bundle)
         old_pid = yield self.deployment.get_pid()
         self.assert_pid_running(old_pid, True)
 
@@ -292,7 +294,7 @@
         self.patch(UpstartService, "init_dir", self.real_init_dir)
 
         d = self.deployment.start(
-            "0", get_test_zookeeper_address(), self.bundle)
+            "snowflake", "0", get_test_zookeeper_address(), self.bundle)
         e = yield self.assertFailure(d, UnitDeploymentError)
         self.assertTrue(str(e).startswith(
             "Failed to start job juju-wordpress-0; got output:\n"))
@@ -366,8 +368,10 @@
         mock_deploy = self.mocker.patch(self.unit_deploy)
         # this minimally validates that we are also called with the
         # expect public key
+
         def is_cloudinit(obj):
             return isinstance(obj, CloudInit)
+
         mock_deploy._get_container("0", MATCH(is_cloudinit))
         self.mocker.result((container, rootfs))
 
@@ -379,7 +383,8 @@
         self.unit_deploy.directory = rootfs
         os.makedirs(os.path.join(rootfs, "etc", "init"))
 
-        yield self.unit_deploy.start("0", "127.0.1.1:2181", self.bundle)
+        yield self.unit_deploy.start(
+            "snowflake", "0", "127.0.1.1:2181", self.bundle)
 
         # Verify the symlinks exist
         self.assertTrue(os.path.lexists(os.path.join(
@@ -410,9 +415,9 @@
     def test_get_container(self):
         rootfs = self.makeDir()
         cloud_init = self.unit_deploy._get_cloud_init(zookeepers='localhost')
-
+        cloud_init.set_environment_id('snowflake')
         expected = serializer.load(
-                open(os.path.join(DATA_DIR, 'test_get_container')))
+            open(os.path.join(DATA_DIR, 'test_get_container')))
         rendered = serializer.load(cloud_init.render())
         self.assertEquals(rendered, expected)
 

=== modified file 'juju/machine/unit.py'
--- juju/machine/unit.py	2012-09-27 00:42:32 +0000
+++ juju/machine/unit.py	2013-01-17 11:10:30 +0000
@@ -8,7 +8,7 @@
 
 from juju.charm.bundle import CharmBundle
 from juju.errors import ServiceError
-from juju.lib.lxc import LXCContainer, get_containers, LXCError
+from juju.lib.lxc import LXCContainer, get_containers
 from juju.lib.twistutils import get_module_directory
 from juju.lib.upstart import UpstartService
 from juju.providers.common.cloudinit import CloudInit
@@ -27,12 +27,17 @@
     return UnitMachineDeployment
 
 
-def _get_environment(unit_name, juju_home, machine_id, zookeeper_hosts):
+def _get_environment(unit_name,
+                     juju_home, machine_id, zookeeper_hosts, env_id):
+    """
+    Return environment dictionary for unit.
+    """
     environ = dict()
     environ["JUJU_MACHINE_ID"] = str(machine_id)
     environ["JUJU_UNIT_NAME"] = unit_name
     environ["JUJU_HOME"] = juju_home
     environ["JUJU_ZOOKEEPER"] = zookeeper_hosts
+    environ["JUJU_ENV_UUID"] = env_id
     environ["PYTHONPATH"] = ":".join(
         filter(None, [
             os.path.dirname(get_module_directory(juju)),
@@ -66,13 +71,14 @@
             "juju-%s" % self.unit_path_name, use_sudo=True)
 
     @inlineCallbacks
-    def start(self, machine_id, zookeeper_hosts, bundle):
+    def start(self, env_id, machine_id, zookeeper_hosts, bundle):
         """Start a service unit agent."""
         self.unpack_charm(bundle)
         self.service.set_description(
             "Juju unit agent for %s" % self.unit_name)
         self.service.set_environ(_get_environment(
-            self.unit_name, self.juju_home, machine_id, zookeeper_hosts))
+            self.unit_name, self.juju_home, machine_id,
+            zookeeper_hosts, env_id))
         self.service.set_command(" ".join((
             "/usr/bin/python", "-m", self.unit_agent_module,
             "--nodaemon",
@@ -189,7 +195,7 @@
                 (zk, port) = zk.split(':')
             else:
                 port = 2181
-            zks.append((zk,port))
+            zks.append((zk, port))
 
         cloud_init.set_zookeeper_hosts(zks)
         # XXX Very hard to access the provider's notion of network
@@ -228,7 +234,7 @@
         returnValue((container, directory))
 
     @inlineCallbacks
-    def start(self, machine_id, zookeeper_hosts, bundle):
+    def start(self, env_id, machine_id, zookeeper_hosts, bundle):
         """Start the unit.
 
         Creates and starts an lxc container for the unit.

=== modified file 'juju/providers/common/cloudinit.py'
--- juju/providers/common/cloudinit.py	2012-10-20 19:23:19 +0000
+++ juju/providers/common/cloudinit.py	2013-01-17 11:10:30 +0000
@@ -56,7 +56,8 @@
         "--session-file /var/run/juju/machine-agent.zksession")
     return service.get_cloud_init_commands()
 
-def _unit_scripts(machine_id, unit_name, zookeeper_hosts, juju_home):
+
+def _unit_scripts(machine_id, unit_name, zookeeper_hosts, juju_home, env_id):
     unit_path_name = unit_name.replace('/', '-')
     service_name = "juju-%s" % unit_path_name
     service = UpstartService(service_name)
@@ -66,6 +67,7 @@
             {"JUJU_MACHINE_ID": str(machine_id),
              "JUJU_UNIT_NAME": unit_name,
              "JUJU_HOME": juju_home,
+             "JUJU_ENV_UUID": env_id,
              "JUJU_ZOOKEEPER": zookeeper_hosts})
     service.set_output_path(
         "/var/log/juju/unit-%s-output.log" % unit_path_name)
@@ -78,6 +80,7 @@
                 "/var/run/juju/unit-%s-agent.zksession" % unit_path_name]))
     return service.get_cloud_init_commands()
 
+
 def _apiserver_scripts(zookeeper_hosts):
     service = UpstartService("juju-api-agent")
     service.set_description("Juju api agent")
@@ -186,6 +189,7 @@
         self._unit_name = None
         self._juju_home = None
         self._apt_proxy = None
+        self._env_id = None
 
     def add_ssh_key(self, key):
         """Add an SSH public key.
@@ -239,6 +243,11 @@
             self._origin = PROPOSED
             self._origin_url = None
 
+    def set_environment_id(self, id):
+        """Specify the environment id.
+        """
+        self._env_id = id
+
     def set_machine_id(self, id):
         """Specify the juju machine ID.
 
@@ -314,7 +323,7 @@
 
     def set_apt_proxy(self, proxy):
         """Specify an apt proxy to configure
-        
+
         :param proxy: proxy to set for APT using Acquire:HTTP
         :type str
         """
@@ -409,7 +418,8 @@
                 self._machine_id,
                 self._unit_name,
                 self._join_zookeeper_hosts(),
-                self._juju_home))
+                self._juju_home,
+                self._env_id))
         if self._provision:
             scripts.extend(_provision_scripts(self._join_zookeeper_hosts()))
             scripts.extend(_apiserver_scripts(self._join_zookeeper_hosts()))

=== modified file 'juju/providers/maas/maas.py'
--- juju/providers/maas/maas.py	2012-10-04 11:16:58 +0000
+++ juju/providers/maas/maas.py	2013-01-17 11:10:30 +0000
@@ -5,7 +5,9 @@
 
 from base64 import b64encode
 import json
+import logging
 import re
+from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python.failure import Failure
 from twisted.web.error import Error
 from urllib import urlencode
@@ -17,6 +19,9 @@
 from juju.providers.maas.files import encode_multipart_data
 
 
+log = logging.getLogger("juju.maas")
+
+
 CONSUMER_SECRET = ""
 
 
@@ -80,7 +85,7 @@
         # error text that it comes with.
         if isinstance(error, Error):
             raise ProviderError(error.response)
-        
+
         return convert_unknown_error(failure)
 
     def get(self, path, params):
@@ -172,10 +177,16 @@
         params = {"op": "release"}
         return self.post(resource_uri, params)
 
+    @inlineCallbacks
     def list_tags(self):
         """Ask MAAS to return a list of all the tags defined.
 
         :return: A Deferred whose value is the list of tags.
         """
         params = {"op": "list"}
-        return self.get("api/1.0/tags/", params)
+        try:
+            value = yield self.get("api/1.0/tags/", params)
+        except ProviderError as e:
+            log.error("Listing valid maas-tags failed: %s", e)
+            value = []
+        returnValue(value)

=== modified file 'juju/providers/maas/tests/test_maas.py'
--- juju/providers/maas/tests/test_maas.py	2012-10-04 11:16:58 +0000
+++ juju/providers/maas/tests/test_maas.py	2013-01-17 11:10:30 +0000
@@ -5,9 +5,11 @@
 
 import json
 from textwrap import dedent
-from twisted.internet.defer import inlineCallbacks, succeed
 from urlparse import urlparse
 
+from twisted.internet.defer import inlineCallbacks, fail, succeed
+from twisted.web.error import Error
+
 from juju.errors import ProviderError
 from juju.providers.maas.maas import extract_system_id, MAASClient
 from juju.providers.maas.tests.testing import (
@@ -15,6 +17,13 @@
     FakeMAASHTTPConnectionWithNoAvailableNodes, NODE_JSON, TestCase)
 
 
+class FakeMAASHTTPConnectionWithNoTags(FakeMAASHTTPConnection):
+    """Fake client that raises Not Found on tag listing"""
+
+    def list_tags(self):
+        return fail(Error(404, "Not Found", "Tags? What tags?"))
+
+
 class TestFunctions(TestCase):
 
     def assertExtractSystemID(self, system_id, resource_uri):
@@ -220,6 +229,18 @@
         self.assertEqual("No matching node is available.", str(e))
 
     @inlineCallbacks
+    def test_list_tags_unsupported(self):
+        """When tags are unspupported just report no valid tags"""
+        log = self.setup_connection(
+            MAASClient, FakeMAASHTTPConnectionWithNoTags)
+        client = MAASClient(CONFIG)
+        log = self.capture_logging()
+        result = yield client.list_tags()
+        self.assertEqual([], result)
+        self.assertRegexpMatches(log.getvalue(),
+            "(?m)^Listing valid maas-tags failed: ")
+
+    @inlineCallbacks
     def test_start_node(self):
         resource_uri = NODE_JSON[0]["resource_uri"]
         series = "splendid"

=== modified file 'juju/providers/openstack/client.py'
--- juju/providers/openstack/client.py	2012-10-03 15:16:42 +0000
+++ juju/providers/openstack/client.py	2013-01-17 11:10:30 +0000
@@ -391,7 +391,7 @@
         return self.delete(["servers", server_id], code=204)
 
     def run_server(self, image_id, flavor_id, name, security_group_names=None,
-        user_data=None):
+                   user_data=None, scheduler_hints=None):
         server = {
             'name': name,
             'flavorRef': flavor_id,
@@ -402,6 +402,8 @@
         if security_group_names is not None:
             server["security_groups"] = [{'name': n}
                 for n in security_group_names]
+        if scheduler_hints is not None:
+            server["OS-SCH-HNT:scheduler_hints"] = scheduler_hints
         return self.post(["servers"], {'server': server},
             root="server", code=202)
 
@@ -409,12 +411,18 @@
         d = self.get(
             ["servers", server_id, "os-security-groups"],
             root="security_groups")
-        # 2012-07-12: Workaround lack of this api in HP cloud
-        d.addErrback(
-            lambda f: self.get_server(server_id).addCallback(
-                operator.itemgetter("security_groups")))
+
+        # 2012-07-12: kt Workaround lack of this api in HP cloud
+        def _get_group_fallback(f):
+            log.debug("Falling back to older/diablo sec groups api")
+            return self.get_server(server_id).addCallback(
+                operator.itemgetter("security_groups"))
+        d.addErrback(_get_group_fallback)
         return d
 
+    def get_security_group_details(self, group_id):
+        return self.get(["os-security-groups", group_id], "security_group")
+
     def list_security_groups(self):
         return self.get(["os-security-groups"], "security_groups")
 

=== 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-01-17 11:10:30 +0000
@@ -86,19 +86,23 @@
         # 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()
         flavor_id = _solve_flavor(self._constraints, flavor_name, flavors)
 
+        hints = self._constraints["os-scheduler-hints"]
+
         server = yield self._provider.nova.run_server(
             name="juju %s instance %s" %
                 (self._provider.environment_name, machine_id,),
             image_id=image_id,
             flavor_id=flavor_id,
             security_group_names=security_groups,
-            user_data=user_data)
+            user_data=user_data,
+            scheduler_hints=hints,
+            )
 
         if self._master:
             yield filestorage.put(id_name, StringIO(str(server['id'])))

=== modified file 'juju/providers/openstack/ports.py'
--- juju/providers/openstack/ports.py	2012-09-19 05:34:00 +0000
+++ juju/providers/openstack/ports.py	2013-01-17 11:10:30 +0000
@@ -55,21 +55,34 @@
         group_name = self._machine_group_name(machine_id)
         server_id = machine.instance_id
         groups = yield self.nova.get_server_security_groups(server_id)
+
+        found = False
         for group in groups:
             if group['name'] == group_name:
-                returnValue(group)
+                found = group
+                break
+
+        # 2012/12/19: kt diablo/hpcloud compatibility
+        if found and not 'rules' in group:
+            group = yield self.nova.get_security_group_details(group['id'])
+            found = True
+
+        if found:
+            returnValue(group)
+
         raise errors.ProviderInteractionError(
             "Missing security group %r for machine %r" %
-                (group_name, server_id))
+            (group_name, server_id))
 
     @inlineCallbacks
     def open_port(self, machine, machine_id, port, protocol="tcp"):
         """Allow access to a port for the given machine only"""
         group = yield self._get_machine_group(machine, machine_id)
-        yield self.nova.add_security_group_rule(group['id'],
+        yield self.nova.add_security_group_rule(
+            group['id'],
             ip_protocol=protocol, from_port=port, to_port=port)
         log.debug("Opened %s/%s on machine %r",
-            port, protocol, machine.instance_id)
+                  port, protocol, machine.instance_id)
 
     @inlineCallbacks
     def close_port(self, machine, machine_id, port, protocol="tcp"):
@@ -78,13 +91,14 @@
         for rule in group["rules"]:
             if (port == rule["from_port"] == rule["to_port"] and
                 rule["ip_protocol"] == protocol):
+
                 yield self.nova.delete_security_group_rule(rule["id"])
                 log.debug("Closed %s/%s on machine %r",
                           port, protocol, machine.instance_id)
                 return
         raise errors.ProviderInteractionError(
             "Couldn't close unopened %s/%s on machine %r",
-                  port, protocol, machine.instance_id)
+            port, protocol, machine.instance_id)
 
     @inlineCallbacks
     def get_opened_ports(self, machine, machine_id):
@@ -113,11 +127,12 @@
         juju_group = self._juju_group_name()
         if not juju_group in groups_by_name:
             log.debug("Creating juju security group %s", juju_group)
-            sg = yield self.nova.create_security_group(juju_group,
+            sg = yield self.nova.create_security_group(
+                juju_group,
                 "juju group for %s" % (self.tag,))
             # Add external ssh access
-            yield self.nova.add_security_group_rule(sg['id'],
-                ip_protocol="tcp", from_port=22, to_port=22)
+            yield self.nova.add_security_group_rule(
+                sg['id'], ip_protocol="tcp", from_port=22, to_port=22)
             # Add internal group access
             yield self.nova.add_security_group_rule(
                 parent_group_id=sg['id'], group_id=sg['id'],
@@ -131,7 +146,8 @@
             yield self.nova.delete_security_group(
                 groups_by_name[machine_group])
         log.debug("Creating machine security group %s", machine_group)
-        yield self.nova.create_security_group(machine_group,
+        yield self.nova.create_security_group(
+            machine_group,
             "juju group for %s machine %s" % (self.tag, machine_id))
 
         returnValue([juju_group, machine_group])
@@ -157,7 +173,8 @@
         server_id = machine.instance_id
         groups = yield self.nova.get_server_security_groups(server_id)
         juju_group = self._juju_group_name()
-        groups_by_name = dict((g['name'], g['id']) for g in groups
+        groups_by_name = dict(
+            (g['name'], g['id']) for g in groups
             if g['name'].startswith(juju_group))
         if juju_group not in groups_by_name:
             # Not a juju machine, shouldn't touch

=== modified file 'juju/providers/openstack/provider.py'
--- juju/providers/openstack/provider.py	2012-09-05 11:07:35 +0000
+++ juju/providers/openstack/provider.py	2013-01-17 11:10:30 +0000
@@ -11,6 +11,7 @@
 """
 
 import logging
+import json
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
@@ -33,6 +34,15 @@
 log = logging.getLogger("juju.openstack")
 
 
+def _convert_scheduler_hints(string):
+    """Check constraint value suitable for Nova SchedulerHints extension"""
+    obj = json.loads(string)
+    if not isinstance(obj, dict):
+        raise ValueError("Need json object of key/value strings")
+    # GZ 2012-10-26: Does nova have other restrictions on what it will accept?
+    return obj
+
+
 class MachineProvider(MachineProviderBase):
     """MachineProvider for use in an OpenStack environment"""
 
@@ -83,6 +93,13 @@
             returnValue(cs)
         cs = yield super(MachineProvider, self).get_constraint_set()
 
+        # Pseudo-constraint that does not affect flavor selected but is passed
+        # through to server creation for influencing the scheduler, for
+        # instance in the placement of the server.
+        # Perhaps only register this constraint if the deployment advertises
+        # the SchedulerHints extension as available?
+        cs.register("os-scheduler-hints", converter=_convert_scheduler_hints)
+
         # Fetch provider defined instance types (just names)
         flavors = yield self.nova.list_flavors()
         flavor_names = [f['name'] for f in flavors]

=== 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-01-17 11:10:30 +0000
@@ -47,6 +47,8 @@
 
     def setup_constraints(self):
         self.constraint_set = ConstraintSet(self.provider_type)
+        self.constraint_set.register("os-scheduler-hints",
+            converter=json.loads)
         self.constraint_set.register_generics(
             [f['name'] for f in self.default_flavors])
 
@@ -100,7 +102,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 +190,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_client.py'
--- juju/providers/openstack/tests/test_client.py	2012-09-28 15:53:06 +0000
+++ juju/providers/openstack/tests/test_client.py	2013-01-17 11:10:30 +0000
@@ -198,6 +198,36 @@
         deferred = osc.authenticate()
         return self.assertFailure(deferred, errors.SSLVerificationError)
 
+    def is_server_with_hints(self, producer):
+        obj = json.loads(producer.content)
+        self.assertEqual({"server": {
+                "imageRef": "an-image",
+                "flavorRef": "a-flavor",
+                "name": "Test",
+                "OS-SCH-HNT:scheduler_hints": {"hint-key": "hint-val"},
+            }}, obj)
+        return True
+
+    @defer.inlineCallbacks
+    def test_run_server_passes_hints(self):
+        config, osc = self.make_client_legacy()
+        self.mock_agent.request("POST",
+            "https://testing.invalid/compute/servers", mocker.ANY,
+            mocker.MATCH(self.is_server_with_hints))
+        response = FakeResponse(202, http_headers.Headers({
+            "Content-Type": ["application/json"],
+            }),
+            json.dumps({'server': {
+            }}))
+        self.mocker.result(defer.succeed(response))
+        self.mocker.replay()
+        # Fake having already authenticated by setting token and services
+        osc.token = "tok"
+        osc.services = {"compute": "https://testing.invalid/compute"}
+        novac = client._NovaClient(osc)
+        result = yield novac.run_server("an-image", "a-flavor", "Test",
+            scheduler_hints={"hint-key": "hint-val"})
+
 
 class TestReauthentication(testing.TestCase):
 

=== 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-01-17 11:10:30 +0000
@@ -32,13 +32,15 @@
         self.nova.list_flavor_details()
         self.mocker.result(succeed(self.default_flavors))
 
-    def expect_run_server(self, machine_id, cc_match, response, flavor_id=1):
+    def expect_run_server(self, machine_id, cc_match, response, flavor_id=1,
+            hints=None):
         self.nova.run_server(
             name="juju testing instance " + machine_id,
             image_id=42,
             flavor_id=flavor_id,
             security_group_names=["juju-x", "juju-y"],
             user_data=MATCH(cc_match),
+            scheduler_hints=hints,
             )
         self.mocker.result(succeed(response))
 
@@ -113,6 +115,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 +135,43 @@
                 },
             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_scheduler_hints(self):
+        provider = MockedLaunchProvider(self.mocker)
+        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': []},
+                },
+            hints={"hint-key": "hint-value"})
+        self.mocker.replay()
+        self.capture_and_check_log()
+        return provider.launch("1", constraints=[
+            "os-scheduler-hints={\"hint-key\": \"hint-value\"}"])
+
+    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 +183,7 @@
                 'addresses': {'public': []},
             })
         self.mocker.replay()
+        self.capture_and_check_log()
         return provider.launch("1")
 
     def test_start_machine_delay(self):
@@ -159,6 +204,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 +221,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):

=== modified file 'juju/providers/openstack/tests/test_ports.py'
--- juju/providers/openstack/tests/test_ports.py	2012-09-19 05:34:00 +0000
+++ juju/providers/openstack/tests/test_ports.py	2013-01-17 11:10:30 +0000
@@ -39,10 +39,10 @@
 
     def test_open_port(self):
         """Opening a port adds the rule to the appropriate security group"""
-        self.expect_nova_get("servers/1000/os-security-groups",
+        self.expect_nova_get(
+            "servers/1000/os-security-groups",
             response={'security_groups': [
-                    {'name': "juju-testing-1", 'id': 1},
-                ]})
+                {'name': "juju-testing-1", 'id': 1, 'rules': []}]})
         self.expect_create_rule(1, "tcp", 80)
         self.mocker.replay()
 
@@ -52,9 +52,34 @@
 
         def _check_log(_):
             self.assertIn("Opened 80/tcp on machine '1000'",
-                log.getvalue())
+                          log.getvalue())
         return deferred.addCallback(_check_log)
 
+    def test_diablo_hpcloud_ccompatbility(self):
+        """Verify compatibility workarounds for hpcloud/diablo."""
+        self.expect_nova_get(
+            "servers/1000/os-security-groups",
+            response={'security_groups': [
+                {'name': "juju-testing-1", 'id': 1}]})
+
+        self.expect_nova_get(
+            "os-security-groups/1",
+            response={'security_group': {
+                'name': "juju-testing-1",
+                'id': 1,
+                'rules': [{
+                    'id': 1,
+                    'parent_group_id': 1,
+                    'ip_protocol': 'tcp',
+                    'from_port': 80,
+                    'to_port': 80}]}})
+
+        self.mocker.replay()
+
+        machine = NovaProviderMachine('1000', "server1000.testing.invalid")
+        deferred = self.get_provider().get_opened_ports(machine, "1")
+        return deferred.addCallback(self.assertEqual, set([(80, "tcp")]))
+
     def test_open_port_missing_group(self):
         """Missing security group raises an error on deleting port"""
         self.expect_nova_get("servers/1000/os-security-groups",

=== modified file 'juju/providers/openstack/tests/test_provider.py'
--- juju/providers/openstack/tests/test_provider.py	2012-08-28 16:11:04 +0000
+++ juju/providers/openstack/tests/test_provider.py	2013-01-17 11:10:30 +0000
@@ -192,3 +192,32 @@
         cs2 = yield provider.get_constraint_set()
         self.assertIsInstance(cs2, ConstraintSet)
         self.assertEqual(cs, cs2)
+
+    def create_constraint_set(self):
+        self.expect_nova_get("flavors",
+            response={'flavors': self.default_flavors})
+        self.mocker.replay()
+        provider = self.get_provider()
+        return provider.get_constraint_set()
+
+    @inlineCallbacks
+    def test_parse_scheduler_hints_one(self):
+        cs = yield self.create_constraint_set()
+        c = cs.parse(["os-scheduler-hints={\"hint-key\": \"hint-val\"}"])
+        self.assertEqual({"hint-key": "hint-val"}, c["os-scheduler-hints"])
+
+    @inlineCallbacks
+    def test_parse_scheduler_hints_bad_value(self):
+        cs = yield self.create_constraint_set()
+        err = self.assertRaises(errors.ConstraintError,
+            cs.parse, ["os-scheduler-hints=notjson"])
+        self.assertRegexpMatches(str(err),
+            "Bad 'os-scheduler-hints' constraint 'notjson': .*")
+
+    @inlineCallbacks
+    def test_parse_scheduler_hints_bad_array(self):
+        cs = yield self.create_constraint_set()
+        err = self.assertRaises(errors.ConstraintError,
+            cs.parse, ["os-scheduler-hints=[]"])
+        self.assertRegexpMatches(str(err),
+            "Bad 'os-scheduler-hints' constraint '\\[\\]': .*")

=== modified file 'juju/rapi/transport/tests/test_ws.py'
--- juju/rapi/transport/tests/test_ws.py	2012-10-04 15:58:43 +0000
+++ juju/rapi/transport/tests/test_ws.py	2013-01-17 11:10:30 +0000
@@ -74,7 +74,7 @@
         self.provider = MachineProvider(
             "cloudy", {"default-series": "precise"})
         self.ws_factory = WebSocketAPIFactory(
-            get_test_zookeeper_address(), self.provider)
+            get_test_zookeeper_address(), self.provider, "uuid1")
         self.ws = self.ws_factory.buildProtocol()
         self.ws.transport = self.transport = OWTransport(self.ws)
         self.ws._schedule = lambda: 1
@@ -92,7 +92,7 @@
     def test_greeting(self):
 
         d = self.transport.watch_dict(dict(
-            version=0, ready=True, provider_type="dummy",
+            version=0, ready=True, provider_type="dummy", uuid="uuid1",
             default_series="precise"))
         self.ws.connectionMade()
         return d

=== modified file 'juju/rapi/transport/ws.py'
--- juju/rapi/transport/ws.py	2012-10-04 15:58:43 +0000
+++ juju/rapi/transport/ws.py	2013-01-17 11:10:30 +0000
@@ -23,13 +23,15 @@
 
     The client MUST wait for initial handshake from the server.
     """
-    def __init__(self, zk_hosts, provider):
+    def __init__(self, zk_hosts, provider, env_uuid):
         # Are we currently accepting/processing messages.
         self.active = False
         # Zk servers to connect to.
         self.zk_hosts = zk_hosts
         # Env Provider (needed for status and constraint set retrieval).
         self.provider = provider
+        # Environment UUID
+        self.env_uuid = env_uuid
         # API Context/Endpoint
         self.context = None
         # Client to zk.
@@ -47,6 +49,7 @@
         """
         self.transport.write(json.dumps(
             {"version": 0, "extensions": [], "ready": True,
+             "uuid": self.env_uuid,
              "provider_type": self.provider.provider_type,
              "default_series": self.provider.config.get("default-series")}))
 
@@ -169,9 +172,10 @@
 
     protocol = APIWebSocket
 
-    def __init__(self, zk_hosts, provider):
+    def __init__(self, zk_hosts, provider, env_uuid):
         self.zk_hosts = zk_hosts
         self.provider = provider
+        self.env_uuid = env_uuid
         self.numClients = 0
         self.stream_manager = DeltaStreamManager(
             APIContext(ManagedClient(self.zk_hosts), self.provider))
@@ -191,7 +195,7 @@
 
     # New connection.
     def buildProtocol(self, addr=None):
-        p = self.protocol(self.zk_hosts, self.provider)
+        p = self.protocol(self.zk_hosts, self.provider, self.env_uuid)
         p.factory = self
         self.stream_manager.add(p)
         return p

=== modified file 'juju/state/environment.py'
--- juju/state/environment.py	2012-09-10 03:20:20 +0000
+++ juju/state/environment.py	2013-01-17 11:10:30 +0000
@@ -85,7 +85,7 @@
     """
 
     def set_provider_type(self, provider_type):
-        return self._set_value("provider-type", provider_type)
+        return self._set_value("provider-type", provider_type, once=True)
 
     def get_provider_type(self):
         return self._get_value("provider-type")
@@ -102,6 +102,12 @@
         """
         return self._set_value("debug-log", bool(enabled))
 
+    def set_environment_id(self, uid):
+        return self._set_value("env-id", uid, once=True)
+
+    def get_environment_id(self):
+        return self._get_value("env-id")
+
     @inlineCallbacks
     def _get_value(self, key, default=None):
         try:
@@ -111,13 +117,15 @@
         data = serializer.load(content)
         returnValue(data.get(key, default))
 
-    def _set_value(self, key, value):
+    def _set_value(self, key, value, once=False):
 
         def set_value(old_content, stat):
             if not old_content:
                 data = {}
             else:
                 data = serializer.load(old_content)
+            if once and key in data:
+                raise ValueError("%s can only be set once" % key)
             data[key] = value
             return serializer.dump(data)
 

=== modified file 'juju/state/hook.py'
--- juju/state/hook.py	2012-09-10 03:20:20 +0000
+++ juju/state/hook.py	2013-01-17 11:10:30 +0000
@@ -1,3 +1,4 @@
+import logging
 from collections import namedtuple
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed, fail
@@ -11,6 +12,9 @@
 from juju.state.utils import YAMLState
 
 
+log = logging.getLogger("juju.state.hook")
+
+
 class RelationChange(
     namedtuple(
         "RelationChange",
@@ -103,16 +107,23 @@
             self._topology = yield self._read_topology()
         service = yield self.get_local_service()
         internal_service_id = service.internal_id
+        service_unit_state = yield self.get_local_unit_state()
         for info in self._topology.get_relations_for_service(
                 internal_service_id):
             service_info = info["service"]
-            relations.append(
-                ServiceRelationState(
-                    self._client,
-                    internal_service_id,
-                    info["relation_id"],
-                    info["scope"],
-                    **service_info))
+            relation = ServiceRelationState(
+                self._client,
+                internal_service_id,
+                info["relation_id"],
+                info["scope"],
+                **service_info)
+            # Verify that it has unit relation state defined in ZK
+            try:
+                yield relation.get_unit_state(service_unit_state)
+                relations.append(relation)
+            except UnitRelationStateNotFound:
+                log.debug("Ignoring partially constructed relation: %s",
+                          relation.relation_ident)
         returnValue(relations)
 
     @inlineCallbacks

=== modified file 'juju/state/initialize.py'
--- juju/state/initialize.py	2012-12-12 19:30:20 +0000
+++ juju/state/initialize.py	2013-01-17 11:10:30 +0000
@@ -1,4 +1,5 @@
 import logging
+import uuid
 
 from twisted.internet.defer import inlineCallbacks
 from txzookeeper.client import ZOO_OPEN_ACL_UNSAFE
@@ -70,6 +71,7 @@
         # Setup default global settings information.
         settings = GlobalSettingsStateManager(self.client)
         yield settings.set_provider_type(self.provider_type)
+        yield settings.set_environment_id(uuid.uuid4().get_hex())
 
         # Create a node that only the admin can read.
         yield self.client.create("/login", acls=[

=== modified file 'juju/state/tests/test_environment.py'
--- juju/state/tests/test_environment.py	2012-09-10 03:20:20 +0000
+++ juju/state/tests/test_environment.py	2013-01-17 11:10:30 +0000
@@ -140,12 +140,25 @@
         """Debug logging is off by default."""
         self.assertEqual((yield self.manager.get_provider_type()), None)
         yield self.manager.set_provider_type("ec2")
+        yield self.assertFailure(
+            self.manager.set_provider_type("abc"), ValueError)
         self.assertEqual((yield self.manager.get_provider_type()), "ec2")
         content, stat = yield self.client.get("/settings")
         self.assertEqual(serializer.load(content),
                          {"provider-type": "ec2"})
 
     @inlineCallbacks
+    def test_set_get_environment(self):
+        self.assertEqual((yield self.manager.get_environment_id()), None)
+        yield self.manager.set_environment_id('snowflake')
+        yield self.assertFailure(
+            self.manager.set_environment_id('snowflake'),
+            ValueError)
+        self.assertEqual(
+            (yield self.manager.get_environment_id()),
+            "snowflake")
+
+    @inlineCallbacks
     def test_get_debug_log_enabled_no_settings_default(self):
         """Debug logging is off by default."""
         value = yield self.manager.is_debug_log_enabled()

=== modified file 'juju/state/tests/test_hook.py'
--- juju/state/tests/test_hook.py	2012-09-10 03:20:20 +0000
+++ juju/state/tests/test_hook.py	2013-01-17 11:10:30 +0000
@@ -1,3 +1,5 @@
+import logging
+
 from twisted.internet.defer import inlineCallbacks, returnValue
 from juju.lib.pick import pick_attr
 from juju.lib import serializer
@@ -98,23 +100,61 @@
         self.relation = self.mysql_states["relation"]
 
     @inlineCallbacks
-    def add_another_blog(self, service_name):
-        blog_ep = RelationEndpoint(
-            service_name, "client-server", "database", "client")
-        mysql_ep = RelationEndpoint(
-            "mysql", "client-server", "db", "server")
-        yield self.add_relation_service_unit_from_endpoints(
-            blog_ep, mysql_ep)
+    def add_another_blog(self, blog_name):
+        blog_ep = RelationEndpoint(blog_name, "client-server", "app", "client")
+        # Fully construct states for the relation connecting to this additional blog
+        other_mysql_states = yield self.add_relation_service_unit_to_another_endpoint(
+                    self.mysql_states, blog_ep)
+        # Then complete in the opposite direction
+        blog_states = yield self.add_opposite_service_unit(other_mysql_states)
+        yield blog_states['service_relations'][-1].add_unit_state(
+            self.mysql_states['unit'])
+        returnValue(blog_states)
 
     @inlineCallbacks
     def add_db_admin_tool(self, admin_name):
         """Add another relation, using a different relation name"""
         admin_ep = RelationEndpoint(
             admin_name, "client-server", "admin-app", "client")
-        mysql_ep = RelationEndpoint(
+        mysql_admin_ep = RelationEndpoint(
             "mysql", "client-server", "db-admin", "server")
-        yield self.add_relation_service_unit_from_endpoints(
-            admin_ep, mysql_ep)
+        mysql_admin_states = yield self.reuse_service_unit_in_new_relation(
+            self.mysql_states, mysql_admin_ep, admin_ep)
+        admin_states = yield self.add_opposite_service_unit(mysql_admin_states)
+        returnValue(admin_states)
+
+    @inlineCallbacks
+    def reuse_service_unit_in_new_relation(self, reused_states, *endpoints):
+        """Reuse an existing service unit as part of a new relation"""
+        service_state = reused_states["service"]
+        unit_state = reused_states["unit"]
+
+        # 1. Setup all service states
+        service_states = [service_state]
+        for endpoint in endpoints[1:]:
+            service_state = yield self.add_service(endpoint.service_name)
+            service_states.append(service_state)
+
+        # 2. And join together in a relation
+        relation_state, service_relation_states = \
+                        yield self.relation_manager.add_relation_state(
+                            *endpoints)
+        # 3. Add a service unit to only the first endpoint - we need
+        #    to test what happens when service units are added to the
+        #    other service state (if any), so do so separately
+        relation_unit_state = yield service_relation_states[0].add_unit_state(
+            unit_state)
+
+        returnValue({
+            "endpoints": list(endpoints),
+            "service": service_states[0],
+            "services": service_states,
+            "unit": unit_state,
+            "relation": relation_state,
+            "service_relation": service_relation_states[0],
+            "unit_relation": relation_unit_state,
+            "service_relations": service_relation_states})
+
 
 
 class HookContextTest(HookContextTestBase, CommonHookContextTestsMixin):
@@ -162,6 +202,35 @@
             set((yield new_context.get_relation_idents(None))),
             set(["db:0", "db:1", "db:2", "db-admin:3"]))
 
+    @inlineCallbacks
+    def test_get_relation_idents_partial_updates_to_zk(self):
+        """Verify relation idents do not reflect partial updates to ZK."""
+        log = self.capture_logging(level=logging.DEBUG)
+
+        # 1. Partial update - no corresponding service relation unit
+        yield self.add_relation_service_unit_to_another_endpoint(
+            self.mysql_states,
+            RelationEndpoint(
+                "wordpress2", "client-server", "app", "client"))
+
+        # 2. Do a complete update of adding another relation and
+        # corresponding units
+        yield self.add_another_blog("wordpress3")
+        context = self.get_context("mysql/0")
+
+        # 3. Observe only the relation ids for wordpress, wordpress3
+        self.assertEqual(
+            set((yield context.get_relation_idents("db"))),
+            set(["db:0", "db:2"]))
+        self.assertIn("Ignoring partially constructed relation: db:1",
+                      log.getvalue())
+
+        # 4. Finally, relation ids for a nonexistent relation are
+        #    still not seen, or cause an error.
+        self.assertEqual(
+            set((yield context.get_relation_idents("not-a-relation"))),
+            set())
+
 
 class RelationHookContextTest(HookContextTestBase,
                               CommonHookContextTestsMixin):
@@ -178,10 +247,6 @@
             self.wordpress_states, "modified", "mysql/0")
 
     def get_context(self, states, change_type, unit_name):
-        change = RelationChange(
-            states["service_relation"].relation_ident,
-            change_type,
-            unit_name)
         return RelationHookContext(
             self.client, states["unit_relation"],
             states["service_relation"].relation_ident,
@@ -605,7 +670,7 @@
         self.assertEqual(
             set((yield new_context.get_relation_idents("db"))),
             set(["db:1"]))
-        yield self.assertFailure( 
+        yield self.assertFailure(
             new_context.get_relation_hook_context("db:0"),
             RelationStateNotFound)
         db1 = yield new_context.get_relation_hook_context("db:1")

=== modified file 'juju/state/tests/test_initialize.py'
--- juju/state/tests/test_initialize.py	2012-12-12 19:30:20 +0000
+++ juju/state/tests/test_initialize.py	2013-01-17 11:10:30 +0000
@@ -91,6 +91,8 @@
         self.assertEqual(instance_id, "i-abcdef")
 
         settings_manager = GlobalSettingsStateManager(self.client)
+        env_id = yield settings_manager.get_environment_id()
+        self.assertEqual(len(env_id), 32)
         self.assertEqual((yield settings_manager.get_provider_type()), "dummy")
         self.assertEqual(
             self.log.getvalue().strip(),

=== modified file 'juju/unit/deploy.py'
--- juju/unit/deploy.py	2012-04-04 20:21:44 +0000
+++ juju/unit/deploy.py	2013-01-17 11:10:30 +0000
@@ -29,6 +29,7 @@
         self.juju_directory = juju_directory
         self.service_state_manager = ServiceStateManager(self.client)
         self.charm_state_manager = CharmStateManager(self.client)
+        self.env_id = None
 
     @property
     def charms_directory(self):
@@ -38,10 +39,12 @@
     def start(self, provider_type=None):
         """Starts the unit deployer."""
         # Find out what provided the machine, and how to deploy units.
+        settings = GlobalSettingsStateManager(self.client)
         if provider_type is None:
-            settings = GlobalSettingsStateManager(self.client)
             provider_type = yield settings.get_provider_type()
+
         self.deploy_factory = get_deploy_factory(provider_type)
+        self.env_id = yield settings.get_environment_id()
 
         if not os.path.exists(self.charms_directory):
             os.makedirs(self.charms_directory)
@@ -89,7 +92,7 @@
         if not running:
             log.debug("Starting service unit %s...", service_unit_name)
             yield deployment.start(
-                self.machine_id, self.client.servers, bundle)
+                self.env_id, self.machine_id, self.client.servers, bundle)
             log.info("Started service unit %s", service_unit_name)
 
     @inlineCallbacks

=== modified file 'juju/unit/tests/test_address.py'
--- juju/unit/tests/test_address.py	2012-10-05 17:49:27 +0000
+++ juju/unit/tests/test_address.py	2013-01-17 11:10:30 +0000
@@ -1,23 +1,18 @@
 import subprocess
-import zookeeper
 
 from twisted.internet.defer import inlineCallbacks, succeed, returnValue
 from twisted.web import client
 
 from juju.errors import JujuError
 from juju.lib.testing import TestCase
+from juju.state.tests.common import StateTestBase
 from juju.unit.address import (
     EC2UnitAddress, LocalUnitAddress, OrchestraUnitAddress, DummyUnitAddress,
     MAASUnitAddress, OpenStackUnitAddress, UnitAddress, get_unit_address)
 from juju.state.environment import GlobalSettingsStateManager
 
 
-class AddressTest(TestCase):
-
-    def setUp(self):
-        zookeeper.set_debug_level(0)
-        self.client = self.get_zookeeper_client()
-        return self.client.connect()
+class AddressTest(StateTestBase):
 
     @inlineCallbacks
     def get_address_for(self, provider_type):

=== modified file 'juju/unit/tests/test_deploy.py'
--- juju/unit/tests/test_deploy.py	2012-03-28 00:38:16 +0000
+++ juju/unit/tests/test_deploy.py	2013-01-17 11:10:30 +0000
@@ -12,6 +12,7 @@
 from juju.machine.tests.test_constraints import (
     dummy_constraints, series_constraints)
 from juju.machine.unit import UnitMachineDeployment
+from juju.state.environment import GlobalSettingsStateManager
 from juju.state.machine import MachineStateManager
 from juju.state.service import ServiceStateManager
 from juju.state.tests.common import StateTestBase
@@ -48,6 +49,9 @@
             add_machine_state(series_constraints)
         yield self.unit_state.assign_to_machine(self.machine_state)
 
+        self.env_settings = GlobalSettingsStateManager(self.client)
+        yield self.env_settings.set_environment_id("snowflake")
+
         # NOTE machine_id must be a str to use with one of the
         # deployment classes
         self.juju_dir = self.makeDir()
@@ -62,13 +66,22 @@
                          UnitMachineDeployment)
 
     @inlineCallbacks
+    def test_start_with_provider_type(self):
+        # bug test against 1100245
+        self.unit_manager = UnitDeployer(
+            self.client, str(self.machine_state.id), self.juju_dir)
+        yield self.unit_manager.start("subordinate")
+        self.assertEqual(self.unit_manager.env_id, "snowflake")
+
+    @inlineCallbacks
     def test_charm_download(self):
         """Downloading a charm should store the charm locally."""
         yield self.unit_manager.download_charm(self.charm_state)
         checksum = self.charm.get_sha256()
         charm_id = local_charm_id(self.charm)
         charm_key = under.quote("%s:%s" % (charm_id, checksum))
-        charm_path = os.path.join(self.unit_manager.charms_directory, charm_key)
+        charm_path = os.path.join(
+            self.unit_manager.charms_directory, charm_key)
 
         self.assertTrue(os.path.exists(charm_path))
         bundle = CharmBundle(charm_path)
@@ -82,10 +95,11 @@
     def test_start_service_unit(self):
         """Verify starting a service unit kicks off the desired deployment."""
         mock_deployment = self.mocker.patch(self.unit_manager.deploy_factory)
-        mock_deployment.start("0", get_test_zookeeper_address(), MATCH_BUNDLE)
+        mock_deployment.start(
+            "snowflake", "0", get_test_zookeeper_address(), MATCH_BUNDLE)
         test_deferred = Deferred()
 
-        def test_complete(machine_id, servers, bundle):
+        def test_complete(env_id, machine_id, servers, bundle):
             test_deferred.callback(True)
 
         self.mocker.call(test_complete)
@@ -95,16 +109,17 @@
         yield test_deferred
         self.assertLogLines(
             self.output.getvalue(),
-            ["Downloading charm local:series/dummy-1 to %s" % \
-                 os.path.join(self.juju_dir, "charms"),
-            "Starting service unit myblog/0...",
-            "Started service unit myblog/0"])
+            ["Downloading charm local:series/dummy-1 to %s" %
+             os.path.join(self.juju_dir, "charms"),
+             "Starting service unit myblog/0...",
+             "Started service unit myblog/0"])
 
     @inlineCallbacks
     def test_kill_service_unit(self):
         """Verify killing a service unit destroys the deployment."""
         mock_deployment = self.mocker.patch(self.unit_manager.deploy_factory)
-        mock_deployment.start("0", get_test_zookeeper_address(), MATCH_BUNDLE)
+        mock_deployment.start(
+            "snowflake", "0", get_test_zookeeper_address(), MATCH_BUNDLE)
         self.mocker.result(succeed(True))
         mock_deployment.destroy()
         self.mocker.result(succeed(True))
@@ -126,8 +141,8 @@
         yield test_deferred
         self.assertLogLines(
             self.output.getvalue(),
-            ["Downloading charm local:series/dummy-1 to %s" % \
-                 os.path.join(self.juju_dir, "charms"),
+            ["Downloading charm local:series/dummy-1 to %s" %
+             os.path.join(self.juju_dir, "charms"),
              "Starting service unit myblog/0...",
              "Started service unit myblog/0",
              "Stopping service unit myblog/0...",

=== modified file 'juju/unit/tests/test_lifecycle.py'
--- juju/unit/tests/test_lifecycle.py	2012-09-10 03:20:20 +0000
+++ juju/unit/tests/test_lifecycle.py	2013-01-17 11:10:30 +0000
@@ -68,6 +68,7 @@
         self.executor.start()
         self.change_environment(
             PATH=os.environ["PATH"],
+            JUJU_ENV_UUID="snowflake",
             JUJU_UNIT_NAME="service-unit/0")
 
     @inlineCallbacks
@@ -897,14 +898,19 @@
         self.write_hook(
             "start",
             '#!/bin/sh\n echo "hello world"\n')
-        yield self.add_opposite_service_unit(self.states)
+        blog_states = yield self.add_opposite_service_unit(self.states)
+        yield blog_states['service_relations'][-1].add_unit_state(
+            self.states['unit'])
+
         for i in range(1, 3):
-            yield self.add_opposite_service_unit(
+            blog_states = yield self.add_opposite_service_unit(
                 (yield self.add_relation_service_unit_to_another_endpoint(
                         self.states,
                         RelationEndpoint(
                             "wordpress-%d" % i,
                             "client-server", "db", "client"))))
+            yield blog_states['service_relations'][-1].add_unit_state(
+                self.states['unit'])
 
         finished = self.wait_on_hook("app-relation-changed", 3)
         yield self.lifecycle.start()
@@ -1006,6 +1012,7 @@
         charm specification of hook invocation."""
         self.change_environment(
             PATH=os.environ["PATH"],
+            JUJU_ENV_UUID="snowflake",
             JUJU_UNIT_NAME="service-unit/0")
         change = RelationChange("clients:42", "joined", "s/2")
         unit_hook_path = self.makeDir()
@@ -1014,6 +1021,7 @@
         self.assertEqual(environ["JUJU_RELATION"], "clients")
         self.assertEqual(environ["JUJU_RELATION_ID"], "clients:42")
         self.assertEqual(environ["JUJU_REMOTE_UNIT"], "s/2")
+        self.assertEqual(environ["JUJU_ENV_UUID"], "snowflake")
         self.assertEqual(environ["CHARM_DIR"],
                          os.path.join(unit_hook_path, "charm"))
 
@@ -1328,14 +1336,20 @@
         # Setup 5 different wordpress services, wordpress, wordpress-1
         # through wordpress-4 with one service unit each. Each of these
         # will be on the relation app:0 ... app:4
-        yield self.add_opposite_service_unit(self.states)
+        blog_states = yield self.add_opposite_service_unit(self.states)
+        yield blog_states['service_relations'][-1].add_unit_state(
+            self.states['unit'])
+
         for i in range(1, 5):
-            yield self.add_opposite_service_unit(
+            blog_states = yield self.add_opposite_service_unit(
                 (yield self.add_relation_service_unit_to_another_endpoint(
                         self.states,
                         RelationEndpoint(
                             "wordpress-%d" % i,
                             "client-server", "db", "client"))))
+            yield blog_states['service_relations'][-1].add_unit_state(
+                self.states['unit'])
+
         yield self.lifecycle.start()
         yield self.wait_on_hook(
             sequence=["app-relation-joined", "app-relation-changed"])