Updated Amulet

Makefile

@@ -19,5 +19,9 @@ sync: bin/charm_helpers_sync.py
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml
 
 publish: lint unit_test
-	bzr push lp:charms/neutron-plumgrid-plugin
-	bzr push lp:charms/trusty/neutron-plumgrid-plugin
+	bzr push lp:charms/neutron-api-plumgrid
+	bzr push lp:charms/trusty/neutron-api-plumgrid
+
+test:
+	@echo Starting Amulet tests...
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700

tests/14-juno

@@ -9,7 +9,7 @@ class TestDeployment(unittest.TestCase):
     def setUpClass(cls):
         cls.deployment = amulet.Deployment(series='trusty')
         cls.deployment.load_bundle_file(
-            bundle_file='files/neutron-plumgrid-plugin.yaml',
+            bundle_file='files/neutron-api-plumgrid.yaml',
             deployment_name='test')
         try:
             cls.deployment.setup(timeout=2000)
@@ -22,7 +22,7 @@ class TestDeployment(unittest.TestCase):
 
     def test_packages_installed(self):
         pg_sentry = self.deployment.sentry['neutron-api/0']
-        for package in {'plumgrid-pythonlib', 'plumgrid-puppet'}:
+        for package in {'plumgrid-pythonlib'}:
             output, code = pg_sentry.run("dpkg -l {}".format(package))
             if code != 0:
                 message = "{} package not found.".format(package)

tests/files/neutron-api-plumgrid.yaml

@@ -0,0 +1,132 @@
+test:
+  series: 'trusty'
+  relations:
+  - - mysql
+    - keystone
+  - - nova-cloud-controller
+    - mysql
+  - - nova-cloud-controller
+    - rabbitmq-server
+  - - nova-cloud-controller
+    - glance
+  - - nova-cloud-controller
+    - keystone
+  - - nova-compute
+    - nova-cloud-controller
+  - - nova-compute
+    - mysql
+  - - nova-compute
+    - rabbitmq-server
+  - - nova-compute
+    - glance
+  - - glance
+    - mysql
+  - - glance
+    - keystone
+  - - glance
+    - cinder
+  - - mysql
+    - cinder
+  - - cinder
+    - rabbitmq-server
+  - - cinder
+    - nova-cloud-controller
+  - - cinder
+    - keystone
+  - - openstack-dashboard
+    - keystone
+  - - neutron-api
+    - mysql
+  - - neutron-api
+    - keystone
+  - - neutron-api
+    - rabbitmq-server
+  - - neutron-api
+    - nova-cloud-controller
+  - - neutron-api
+    - neutron-api-plumgrid
+  - - neutron-api-plumgrid
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-edge
+  - - nova-compute
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-gateway
+  services:
+    mysql:
+      charm: cs:trusty/mysql
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    keystone:
+      charm: cs:trusty/keystone
+      num_units: 1
+      options:
+        admin-password: plumgrid
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      num_units: 1
+      options:
+        console-access-protocol: novnc
+        network-manager: Neutron
+        openstack-origin: cloud:trusty-kilo
+        quantum-security-groups: 'yes'
+      to: 'lxc:plumgrid-director=0'
+    glance:
+      charm: cs:trusty/glance
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    cinder:
+      charm: cs:trusty/cinder
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    neutron-api:
+      charm: cs:~plumgrid-team/trusty/neutron-api
+      num_units: 1
+      options:
+        neutron-plugin: plumgrid
+        neutron-security-groups: false
+        openstack-origin: cloud:trusty-kilo
+        plumgrid-password: plumgrid
+        plumgrid-username: plumgrid
+        plumgrid-virtual-ip: 192.168.100.250
+      to: 'lxc:plumgrid-director=0'
+    neutron-api-plumgrid:
+      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
+      options:
+        enable-metadata: True
+    plumgrid-director:
+      charm: cs:~plumgrid-team/trusty/plumgrid-director
+      num_units: 1
+      options:
+        plumgrid-virtual-ip: 192.168.100.250
+    nova-compute:
+      charm: cs:~plumgrid-team/trusty/nova-compute
+      num_units: 1
+      options:
+        enable-live-migration: true
+        enable-resize: true
+        migration-auth-type: ssh
+        openstack-origin: cloud:trusty-kilo
+      to: '0'
+    plumgrid-edge:
+      charm: cs:~plumgrid-team/trusty/plumgrid-edge
+    plumgrid-gateway:
+      charm: cs:~plumgrid-team/trusty/plumgrid-gateway
+      num_units: 1

tests/files/neutron-plumgrid-plugin.yaml

@@ -1,97 +0,0 @@
-test:
-  series: 'trusty'
-  relations:
-  - - neutron-iovisor
-    - neutron-plumgrid-plugin
-  - - keystone
-    - neutron-plumgrid-plugin
-  - - neutron-api
-    - neutron-plumgrid-plugin
-  - - nova-cloud-controller
-    - nova-compute
-  - - glance
-    - nova-compute
-  - - nova-compute
-    - rabbitmq-server
-  - - mysql
-    - nova-compute
-  - - cinder
-    - nova-cloud-controller
-  - - nova-cloud-controller
-    - rabbitmq-server
-  - - glance
-    - nova-cloud-controller
-  - - keystone
-    - nova-cloud-controller
-  - - mysql
-    - nova-cloud-controller
-  - - neutron-api
-    - nova-cloud-controller
-  services:
-    cinder:
-      charm: cs:trusty/cinder
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-juno
-      to: 'lxc:0'
-    glance:
-      charm: cs:trusty/glance
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-juno
-      to: 'lxc:0'
-    keystone:
-      charm: cs:trusty/keystone
-      num_units: 1
-      options:
-        admin-password: plumgrid
-        openstack-origin: cloud:trusty-juno
-      to: 'lxc:0'
-    mysql:
-      charm: cs:trusty/mysql
-      num_units: 1
-      to: 'lxc:0'
-    neutron-api:
-      charm: cs:~plumgrid-team/trusty/neutron-api
-      num_units: 1
-      options:
-        neutron-plugin: "plumgrid"
-        neutron-security-groups: "false"
-        openstack-origin: "cloud:trusty-juno"
-        plumgrid-password: "plumgrid"
-        plumgrid-username: "plumgrid"
-        plumgrid-virtual-ip: "192.168.100.250"
-      to: 'lxc:0'
-    neutron-plumgrid-plugin:
-      charm: cs:~plumgrid-team/trusty/neutron-plumgrid-plugin
-      options:
-        install_keys: 'null'
-        install_sources: "ppa:plumgrid-team/test"
-    neutron-iovisor:
-      charm: cs:~plumgrid-team/trusty/neutron-iovisor
-      num_units: 1
-      options:
-        install_keys: 'null'
-        install_sources: "ppa:plumgrid-team/test"
-      to: 'nova-compute'
-    nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
-      num_units: 1
-      options:
-        console-access-protocol: novnc
-        network-manager: Neutron
-        openstack-origin: cloud:trusty-juno
-        quantum-security-groups: 'yes'
-      to: 'lxc:0'
-    nova-compute:
-      charm: cs:~plumgrid-team/trusty/nova-compute
-      num_units: 1
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        migration-auth-type: ssh
-        openstack-origin: cloud:trusty-juno
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
-      num_units: 1
-      to: 'lxc:0'