From 88712f0d8b3cbb3f701fb26fe6710e10c2939d2f Mon Sep 17 00:00:00 2001
From: "bbaqar@plumgrid.com" <>
Date: Wed, 9 Sep 2015 15:26:38 +0500
Subject: [PATCH] Backport commit

---
 README.md                                   |   5 +
 tests/files/neutron-api-plumgrid-dense.yaml | 133 ++++++++++++++++++++
 tests/files/neutron-api-plumgrid.yaml       |   9 --
 tests/tests.yaml                            |   3 +
 4 files changed, 141 insertions(+), 9 deletions(-)
 create mode 100644 tests/files/neutron-api-plumgrid-dense.yaml
 create mode 100644 tests/tests.yaml

diff --git a/README.md b/README.md
index 3ae1874..bf2ba34 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+# About the PLUMgrid Platform
+
+The [PLUMgrid Platform](http://www.plumgrid.com/technology/plumgrid-platform/) is a software-only solution that provides a rich set of distributed network functions such as routers, switches, NAT, IPAM, DHCP, and it also supports security policies, end-to-end encryption, and third party Layer 4-7 service insertion.
+
 # Overview
 
 This charm enables PLUMgrid Neutron plugin in an OpenStack environment.
@@ -6,6 +10,7 @@ Once deployed, the charm enables the necessary actions in the neutron-server con
 
 It is a subordinate charm to neutron-api charm.
 
+
 # Usage
 
 Instructions on using the charm:
diff --git a/tests/files/neutron-api-plumgrid-dense.yaml b/tests/files/neutron-api-plumgrid-dense.yaml
new file mode 100644
index 0000000..ea1e662
--- /dev/null
+++ b/tests/files/neutron-api-plumgrid-dense.yaml
@@ -0,0 +1,133 @@
+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
+      constraints: "root-disk=30000 cpu-cores=8 mem=8G"
+      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
diff --git a/tests/files/neutron-api-plumgrid.yaml b/tests/files/neutron-api-plumgrid.yaml
index a8e2245..a1a870f 100644
--- a/tests/files/neutron-api-plumgrid.yaml
+++ b/tests/files/neutron-api-plumgrid.yaml
@@ -57,18 +57,15 @@ test:
     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
@@ -77,25 +74,21 @@ test:
         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
@@ -106,7 +99,6 @@ test:
         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:
@@ -124,7 +116,6 @@ test:
         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:
diff --git a/tests/tests.yaml b/tests/tests.yaml
new file mode 100644
index 0000000..c7a9e7e
--- /dev/null
+++ b/tests/tests.yaml
@@ -0,0 +1,3 @@
+makefile:
+  - lint
+