Merge lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/staging into lp:~charmers/charms/bundles/apache-core-batch-processing/bundle

[Cory Johns]

Bundle and test tweaks for Cloud Weather Report.

[lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/staging]

16. By Cory Johns on 2015-07-21

Fixed v3 format bundle pointing at wrong charms

[amir sanjar (asanjar)]

+1

review: Approve

[Kevin W Monroe (kwmonroe)]

+1 LGTM

review: Approve

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-06-17 15:21:59 +0000
+++ bundle.yaml	2015-07-21 14:15:53 +0000
@@ -11,14 +11,14 @@
     annotations:
       gui-x: "250"
       gui-y: "200"
-    constraints: mem=4G
+    constraints: mem=3G
   hdfs-master:
     charm: cs:trusty/apache-hadoop-hdfs-master
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "350"
-    constraints: mem=8G
+    constraints: mem=7G
   plugin:
     charm: cs:trusty/apache-hadoop-plugin
     annotations:
@@ -30,14 +30,14 @@
     annotations:
       gui-x: "600"
       gui-y: "600"
-    constraints: mem=8G
+    constraints: mem=7G
   yarn-master:
     charm: cs:trusty/apache-hadoop-yarn-master
     num_units: 1
     annotations:
       gui-x: "600"
       gui-y: "100"
-    constraints: mem=8G
+    constraints: mem=7G
 series: trusty
 relations:
   - [yarn-master, hdfs-master]

=== added file 'bundles_v3.yaml'
--- bundles_v3.yaml	1970-01-01 00:00:00 +0000
+++ bundles_v3.yaml	2015-07-21 14:15:53 +0000
@@ -0,0 +1,50 @@
+bundle:
+  services:
+    client:
+      charm: cs:trusty/apache-hadoop-client
+      num_units: 1
+      annotations:
+        gui-x: "1300"
+        gui-y: "200"
+    compute-slave:
+      charm: cs:trusty/apache-hadoop-compute-slave
+      num_units: 3
+      annotations:
+        gui-x: "250"
+        gui-y: "200"
+      constraints: mem=3G
+    hdfs-master:
+      charm: cs:trusty/apache-hadoop-hdfs-master
+      num_units: 1
+      annotations:
+        gui-x: "600"
+        gui-y: "350"
+      constraints: mem=7G
+    plugin:
+      charm: cs:trusty/apache-hadoop-plugin
+      annotations:
+        gui-x: "950"
+        gui-y: "200"
+    secondary-namenode:
+      charm: cs:trusty/apache-hadoop-hdfs-secondary
+      num_units: 1
+      annotations:
+        gui-x: "600"
+        gui-y: "600"
+      constraints: mem=7G
+    yarn-master:
+      charm: cs:trusty/apache-hadoop-yarn-master
+      num_units: 1
+      annotations:
+        gui-x: "600"
+        gui-y: "100"
+      constraints: mem=7G
+  series: trusty
+  relations:
+    - [yarn-master, hdfs-master]
+    - [secondary-namenode, hdfs-master]
+    - [compute-slave, yarn-master]
+    - [compute-slave, hdfs-master]
+    - [plugin, yarn-master]
+    - [plugin, hdfs-master]
+    - [client, plugin]

=== modified file 'tests/01-bundle.py'
--- tests/01-bundle.py	2015-06-01 15:03:04 +0000
+++ tests/01-bundle.py	2015-07-21 14:15:53 +0000
@@ -12,7 +12,8 @@
     """
     Base class for tests for Apache Hadoop Bundle.
     """
-    bundle_file = os.path.join(os.path.dirname(__file__), '..', 'bundle.yaml')
+    # have to use the v3 format because that's what amulet supports
+    bundle_file = os.path.join(os.path.dirname(__file__), '..', 'bundles_v3.yaml')
     profile_name = None
 
     @classmethod
@@ -22,17 +23,14 @@
         cls.d = amulet.Deployment(series='trusty')
         with open(cls.bundle_file) as f:
             bun = f.read()
-        profiles = yaml.safe_load(bun)
-        # amulet always selects the first profile, so we have to fudge it here
-        profile = {cls.profile_name: profiles[cls.profile_name]}
-        cls.d.load(profile)
+        bundle = yaml.safe_load(bun)
+        cls.d.load(bundle)
         cls.d.setup(timeout=9000)
         cls.d.sentry.wait()
         cls.hdfs = cls.d.sentry.unit['hdfs-master/0']
         cls.yarn = cls.d.sentry.unit['yarn-master/0']
         cls.slave = cls.d.sentry.unit['compute-slave/0']
         cls.secondary = cls.d.sentry.unit['secondary-namenode/0']
-        cls.plugin = cls.d.sentry.unit['plugin/0']
         cls.client = cls.d.sentry.unit['client/0']
 
     @classmethod
@@ -117,8 +115,6 @@
 
 
 class TestScalable(unittest.TestCase, Base):
-    profile_name = 'apache-core-batch-processing'
-
     @classmethod
     def setUpClass(cls):
         cls.deploy()