Merge lp:~arosales/charms/trusty/ubuntu/update-readme-test-for-lxc-network into lp:~cbjchen/charms/trusty/ubuntu/lxc-network-config

[Antonio Rosales]

Add documentation for new lxc network config option in README and Amulet test for the new lxc network config option.

[Liang Chen (cbjchen)]

LGTM. Thanks!

review: Approve

Unmerged revisions

10. By Antonio Rosales on 2015-03-25

Add documentation for new lxc network config option in readme and Amulet test for the new lxc network config option.

=== modified file 'README.md'
--- README.md	2013-12-12 17:19:32 +0000
+++ README.md	2015-03-25 20:03:18 +0000
@@ -1,6 +1,6 @@
 # Overview
 
-This charm provides a blank [Ubuntu](http://ubuntu.com) image. It does not provide any services other than a blank cloud image for you to manage manually, it is intended for testing and development. 
+This charm provides a blank [Ubuntu](http://ubuntu.com) image. It does not provide any services other than a blank cloud image for you to manage manually, it is intended for testing and development.
 
 # Usage
 
@@ -25,16 +25,32 @@
     juju deploy ubuntu mytestmachine1
     juju deploy ubuntu mytestmachine2
 
-and so on. 
+and so on.
+
+# Configuration
+
+A configuration option to create a new network for LXC containers is provided via a boolean config option, 'new-lxc-network.'
+The default is set to false indicating the same network of the node will also be used for LXC containers.
+
+To use a new network for LXC containers post juju deploy, issue:
+
+    juju set ubuntu new-lxc-network=true
+
+If you want to have a new network for LXC containers on deploy set up a lxc-config.yaml:
+
+    ubuntu:
+      new-lxc-network: true
+
+and pass that as an arugment to deploy:
+
+    juju deploy --config lxc-config.yaml ubuntu
+
+For further information on setting configuration with Juju see https://jujucharms.com/docs/latest/charms-config
 
 ## Known Limitations and Issues
 
 This charm does not provide anything other than a blank server, so it does not relate to other charms.
 
-# Configuration
-
-This charm has no configuration options.
-
 # Contact Information
 
 
@@ -49,4 +65,3 @@
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
 - Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
-

=== modified file 'config.yaml'
--- config.yaml	2015-02-19 21:19:01 +0000
+++ config.yaml	2015-03-25 20:03:18 +0000
@@ -1,7 +1,7 @@
 options:
   new-lxc-network:
     type: boolean
-    default: True
+    default: False 
     description: |
       If True creates new network for lxc containers, otherwise using the
       same network of the node for lxc containers.

=== modified file 'tests/10-deploy-test.py'
--- tests/10-deploy-test.py	2014-01-25 03:15:50 +0000
+++ tests/10-deploy-test.py	2015-03-25 20:03:18 +0000
@@ -3,7 +3,7 @@
 # This Amulet based tests
 # The goal is to ensure the Ubuntu charm
 # sucessfully deploys and can be accessed.
-# Note the Ubuntu charm does not have any 
+# Note the Ubuntu charm does not have any
 # relations or config options.
 
 import amulet
@@ -40,11 +40,12 @@
     # will automatically "FAIL" the test.
     raise
 
-# Access the Ubuntu instance to ensure it has been deployed correctly 
+# Access the Ubuntu instance to ensure it has been deployed correctly
 
 # Define the commands to be ran
 lsb_release_command = 'cat /etc/lsb-release'
 uname_command = 'uname -a'
+lxc_interface_command = 'ifconfig -s lxcbr0'
 
 # Cat the release information
 output, code = d.sentry.unit['ubuntu/0'].run(lsb_release_command)
@@ -54,11 +55,11 @@
     print(output)
     amulet.raise_status(amulet.FAIL, msg=error_message)
 else:
-    message = 'The lsb-release command successfully executed.'
+    message = 'The ' + lsb_release_command + ' successfully executed.'
     print(output)
     print(message)
 
-# Get the uname -a output 
+# Get the uname -a output
 output, code = d.sentry.unit['ubuntu/0'].run(uname_command)
 # Confirm the uname command was ran successfully
 if (code != 0):
@@ -66,6 +67,20 @@
     print(output)
     amulet.raise_status(amulet.FAIL, msg=error_message)
 else:
-    message = 'The uname command successfully executed.'
+    message = 'The ' + uname_command + ' successfully executed.'
+    print(output)
+    print(message)
+
+# Test creating a new network for LXC via new-lxc-network config option.
+# Set the new-lxc-network config option to create a new network for LXC.
+d.configure('ubuntu', {'new-lxc-network': 'true'})
+# Confirm the the lxc bridge interface was sucessfully created
+output, code = d.sentry.unit['ubuntu/0'].run(lxc_interface_command)
+if (code != 0):
+    error_message = 'The lxcbr0 interface was not created.'
+    print(output)
+    amulet.raise_status(amulet.FAIL, msg=error_message)
+else:
+    message = 'The lxcbr0 interface sucessfully created.'
     print(output)
     print(message)