Merge lp:~niedbalski/charms/trusty/mongodb/make-cleanup into lp:charms/trusty/mongodb

[Jorge Niedbalski]

- Cleanup of makefile and test directories.

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #104 trusty-mongodb for niedbalski mp244156
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/hooks.py:1344:39: E251 unexpected spaces around keyword / parameter equals
  tests/01_deploy_tERROR:root:Make target returned non-zero.
est.py:77:80: E501 line too long (81 > 79 characters)
  tests/02_relate_ceilometer_test.py:5:1: E302 expected 2 blank lines, found 1
  make: *** [lint] Error 1

Full lint test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_lint_check/104/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #105 trusty-mongodb for niedbalski mp244156
    UNIT OK: passed

UNIT Results (max last 5 lines):
  yaml.serializer 85 85 0% 2-110
  yaml.tokens 76 76 0% 2-103
  TOTAL 6969 6706 4%
  Ran 1 test in 0.102s
  OK

Full unit test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_unit_test/105/

[lp:~niedbalski/charms/trusty/mongodb/make-cleanup]

62. By Jorge Niedbalski on 2014-12-09

tests/00-setup executable

63. By Jorge Niedbalski on 2014-12-09

Moved test to functional_test target, and "make test" for just running unit tests as per @tvansteenburgh recommendation

64. By Jorge Niedbalski on 2014-12-09

Added test_requirements file, and modified test target to create the virtualenv prior to run

65. By Jorge Niedbalski on 2014-12-09

Don't exclude hooks/tests from flake8 eye

66. By Jorge Niedbalski on 2014-12-09

typo corrections

67. By Jorge Niedbalski on 2014-12-09

Don't exclude hooks/tests from flake8 eye

68. By Jorge Niedbalski on 2014-12-09

Don't exclude hooks/tests from flake8 eye

69. By Jorge Niedbalski on 2014-12-09

Removed unneeded code from clean target

70. By Jorge Niedbalski on 2014-12-09

[make lint] OK

71. By Jorge Niedbalski on 2014-12-09

- "make lint" target now uses the venv.
- lint cleanup

72. By Jorge Niedbalski on 2014-12-09

Added rm -f .coverage

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM, thanks Jorge!

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #105 trusty-mongodb for niedbalski mp244156
    LINT FAIL: lint-test missing

LINT Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_lint_check
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@flake8']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full lint test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_lint_check/105/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #106 trusty-mongodb for niedbalski mp244156
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['nosetest', 'unit.test']
INFO:root:command: make -f Makefile test: .ven
ERROR:root:Make target returned non-zero.
  make: *** empty string invalid as file name. Stop.

Full unit test output: pastebin not avail., cmd error
Build: http://10.230.18.80:8080/job/charm_unit_test/106/

[Ryan Beisner (1chb1n)]

This merge may have broken something. bug @ https://bugs.launchpad.net/charms/+source/mongodb/+bug/1400908

Confirmed by rolling back to rev59 and re-deploying with the stable and next openstack charm sets (both succeeded).

Since our test rigs are in flight atm, I'm looking for a reproducer. Holler with any questions. Thanks!

[Ryan Beisner (1chb1n)]

In-line comment added.

=== modified file 'Makefile'
--- Makefile	2014-11-04 18:22:31 +0000
+++ Makefile	2014-12-09 18:51:40 +0000
@@ -15,15 +15,34 @@
 
 PYTHON := /usr/bin/env python
 
-unittest:
-	tests/01_test_write_log_rotate_config.py
+clean:
+	rm -f .coverage
+	find . -name '*.pyc' -delete
+	rm -rf .venv
+	(which dh_clean && dh_clean) || true
+
+.venv:
+	sudo apt-get install -y gcc python-dev python-virtualenv python-apt
+	virtualenv .venv --system-site-packages
+	.venv/bin/pip install -I -r test_requirements.txt
+
+lint:   .venv
+	.venv/bin/flake8 --exclude hooks/charmhelpers hooks tests unit_tests
+	@charm proof
+
+test:  .venv
+	@echo Starting unit tests...
+	.venv/bin/nosetests -s --nologcapture --with-coverage $(EXTRA) unit_tests/
+
+functional_test:
+	@echo Starting amulet tests...
+	@juju test -v -p AMULET_HTTP_PROXY --timeout 900
 
 sync:
 	@mkdir -p bin
-	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py	
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml
 
-clean:
-	@find . -name \*.pyc -delete
-	@find . -name '*.bak' -delete
-
+publish: lint unit_test
+	bzr push lp:charms/mongodb
+	bzr push lp:charms/trusty/mongodb

=== modified file 'config.yaml'
--- config.yaml	2014-07-30 17:48:09 +0000
+++ config.yaml	2014-12-09 18:51:40 +0000
@@ -211,7 +211,7 @@
       option.
   key:
     type: string
-    default:
+    default: None
     description: >
       Key ID to import to the apt keyring to support use with arbitary source
       configuration from outside of Launchpad archives or PPA's.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-11-18 21:36:44 +0000
+++ hooks/hooks.py	2014-12-09 18:51:40 +0000
@@ -81,16 +81,14 @@
         return(True)
     except Exception, e:
         juju_log("port_check: Unable to connect to %s:%s/%s." %
-        (host, port, protocol))
+                 (host, port, protocol))
         juju_log("port_check: Exception: %s" % str(e))
         return(False)
 
 
-#------------------------------------------------------------------------------
 # update_service_ports:  Convenience function that evaluate the old and new
 #                        service ports to decide which ports need to be
 #                        opened and which to close
-#------------------------------------------------------------------------------
 def update_service_ports(old_service_ports=None, new_service_ports=None):
     juju_log("update_service_ports")
     if old_service_ports is None or new_service_ports is None:
@@ -138,7 +136,7 @@
     try:
         if pid is not None:
             cmd_line = subprocess.check_output('ps -p %d -o cmd h' %
-            int(pid), shell=True)
+                                               int(pid), shell=True)
             retVal = (pid, cmd_line)
         else:
             juju_log("process_check: pid not defined.")
@@ -148,7 +146,7 @@
         retVal = (None, None)
     finally:
         juju_log("process_check returs pid: %s and cmd_line: %s" %
-        retVal)
+                 retVal)
         return(retVal)
 
 
@@ -160,8 +158,6 @@
         return((None, None))
 
 
-
-
 ###############################################################################
 # Charm support functions
 ###############################################################################
@@ -185,11 +181,13 @@
     # logpath
     # Create the directory if not there already
     subprocess.call(['mkdir',
-        '-p',
-        '%s' % os.path.dirname(config_data['logpath'])])
+                     '-p',
+                     '%s' % os.path.dirname(config_data['logpath'])])
     subprocess.call(['chown',
-        '-R',
-        'mongodb:mongodb', os.path.dirname(config_data['logpath'])])
+                     '-R',
+                     'mongodb:mongodb',
+                     os.path.dirname(config_data['logpath'])])
+
     config.append("logpath=%s" % config_data['logpath'])
     config.append("")
 
@@ -302,7 +300,7 @@
 
     # arbiter
     if config_data['arbiter'] != "disabled" and \
-    config_data['arbiter'] != "enabled":
+       config_data['arbiter'] != "enabled":
         config.append("arbiter = %s" % config_data['arbiter'])
         config.append("")
 
@@ -352,7 +350,7 @@
 
 def join_replset(master_node=None, host=None):
     juju_log("join_replset: master_node: %s, host: %s" %
-    (master_node, host))
+             (master_node, host))
     if master_node is None or host is None:
         retVal = False
     else:
@@ -369,8 +367,9 @@
         if re.search(' --replSet %s ' % replicaset_name,
                      mongodb_init_config, re.MULTILINE) is None:
             mongodb_init_config = regex_sub([(' -- ',
-                            ' -- --replSet %s ' % replicaset_name)],
-                            mongodb_init_config)
+                                              ' -- --replSet %s ' %
+                                              replicaset_name)],
+                                            mongodb_init_config)
         retVal = update_file(default_mongodb_init_config, mongodb_init_config)
     except Exception, e:
         juju_log(str(e))
@@ -384,11 +383,12 @@
     pat_replace = []
     if daemon_options is None or daemon_options == "none":
         pat_replace.append(
-        (' --config /etc/mongodb.conf.*', ' --config /etc/mongodb.conf; fi'))
+            (' --config /etc/mongodb.conf.*',
+             ' --config /etc/mongodb.conf; fi'))
     else:
         pat_replace.append(
-        (' --config /etc/mongodb.conf.*',
-            ' --config /etc/mongodb.conf %s; fi' % daemon_options))
+            (' --config /etc/mongodb.conf.*',
+             ' --config /etc/mongodb.conf %s; fi' % daemon_options))
     regex_sub(pat_replace, mongodb_init_config)
     return(update_file(default_mongodb_init_config, mongodb_init_config))
 
@@ -402,8 +402,7 @@
                      mongodb_init_config, re.MULTILINE) is not None:
             mongodb_init_config = regex_sub([
                 (' --replSet %s ' % replicaset_name, ' ')
-                ],
-                            mongodb_init_config)
+                ], mongodb_init_config)
         retVal = update_file(default_mongodb_init_config, mongodb_init_config)
     except Exception, e:
         juju_log(str(e))
@@ -420,7 +419,7 @@
         mongodb_init_config = open(default_mongodb_init_config).read()
         if re.search(' --rest ', mongodb_init_config, re.MULTILINE) is None:
             mongodb_init_config = regex_sub([(' -- ', ' -- --rest ')],
-                                  mongodb_init_config)
+                                            mongodb_init_config)
         retVal = update_file(default_mongodb_init_config, mongodb_init_config)
     except Exception, e:
         juju_log(str(e))
@@ -438,10 +437,10 @@
     try:
         mongodb_init_config = open(default_mongodb_init_config).read()
         if re.search(' --rest ',
-            mongodb_init_config,
-            re.MULTILINE) is not None:
+                     mongodb_init_config,
+                     re.MULTILINE) is not None:
             mongodb_init_config = regex_sub([(' --rest ', ' ')],
-                                  mongodb_init_config)
+                                            mongodb_init_config)
         retVal = update_file(default_mongodb_init_config, mongodb_init_config)
     except Exception, e:
         juju_log(str(e))
@@ -454,7 +453,7 @@
 
 def enable_arbiter(master_node=None, host=None):
     juju_log("enable_arbiter: master_node: %s, host: %s" %
-    (master_node, host))
+             (master_node, host))
     if master_node is None or host is None:
         retVal = False
     else:
@@ -466,17 +465,19 @@
 def configsvr_status(wait_for=default_wait_for, max_tries=default_max_tries):
     config_data = config()
     current_try = 0
+
     while (process_check_pidfile('/var/run/mongodb/configsvr.pid') !=
-    (None, None)) and not port_check(
-        unit_get('private-address'),
-        config_data['config_server_port']) and current_try < max_tries:
+           (None, None)) and not port_check(
+            unit_get('private-address'),
+            config_data['config_server_port']) and current_try < max_tries:
+
         juju_log("configsvr_status: Waiting for Config Server to be ready ...")
         time.sleep(wait_for)
         current_try += 1
     retVal = (
         process_check_pidfile('/var/run/mongodb/configsvr.pid') != (None, None)
         ) == port_check(unit_get('private-address'),
-        config_data['config_server_port']) is True
+                        config_data['config_server_port']) is True
     if retVal:
         return(process_check_pidfile('/var/run/mongodb/configsvr.pid'))
     else:
@@ -508,7 +509,7 @@
 
 
 def enable_configsvr(config_data, wait_for=default_wait_for,
-max_tries=default_max_tries):
+                     max_tries=default_max_tries):
     if config_data is None:
         juju_log("enable_configsvr: config_data not defined.")
         return(False)
@@ -557,16 +558,19 @@
     config_data = config()
     current_try = 0
     while (process_check_pidfile('/var/run/mongodb/mongos.pid') !=
-    (None, None)) and not port_check(
-        unit_get('private-address'),
-        config_data['mongos_port']) and current_try < max_tries:
+           (None, None)) and not port_check(
+            unit_get('private-address'),
+            config_data['mongos_port']) and current_try < max_tries:
+
         juju_log("mongos_status: Waiting for Mongo shell to be ready ...")
         time.sleep(wait_for)
         current_try += 1
     retVal = \
         (process_check_pidfile('/var/run/mongodb/mongos.pid') !=
-        (None, None)) == port_check(unit_get('private-address'),
+         (None, None)) == port_check(
+            unit_get('private-address'),
             config_data['mongos_port']) is True
+
     if retVal:
         return(process_check_pidfile('/var/run/mongodb/mongos.pid'))
     else:
@@ -597,7 +601,7 @@
 
 
 def enable_mongos(config_data=None, config_servers=None,
-    wait_for=default_wait_for, max_tries=default_max_tries):
+                  wait_for=default_wait_for, max_tries=default_max_tries):
     juju_log("enable_mongos")
     if config_data is None or config_servers is None:
         juju_log("enable_mongos: config_data and config_servers are mandatory")
@@ -625,8 +629,6 @@
     if len(config_servers) > 0:
         if len(config_servers) >= 3:
             cmd_line += ' --configdb %s' % ','.join(config_servers[0:3])
-#        else:
-#            cmd_line += ' --configdb %s' % config_servers[0]
     juju_log("enable_mongos: cmd_line: %s" % cmd_line)
     subprocess.call(cmd_line, shell=True)
     retVal = mongos_ready(wait_for, max_tries)
@@ -661,13 +663,13 @@
            current_try < max_tries):
         juju_log(
             "restart_mongod: Waiting for MongoDB to be ready ({}/{})".format(
-            current_try, max_tries))
+                current_try, max_tries))
         time.sleep(wait_for)
         current_try += 1
 
     return(
-        (service('status', 'mongodb') == port_check(my_hostname, my_port))
-         is True)
+        (service('status', 'mongodb') == port_check(my_hostname,
+                                                    my_port)) is True)
 
 
 def backup_cronjob(disable=False):
@@ -742,7 +744,7 @@
     # Trigger volume initialization logic for permanent storage
     volid = volume_get_volume_id()
     if not volid:
-        ## Invalid configuration (whether ephemeral, or permanent)
+        # Invalid configuration (whether ephemeral, or permanent)
         stop_hook()
         mounts = volume_get_all_mounted()
         if mounts:
@@ -753,8 +755,8 @@
             "'volume-ephemeral-storage' and 'volume-map'")
         sys.exit(1)
     if volume_is_permanent(volid):
-        ## config_changed_volume_apply will stop the service if it finds
-        ## it necessary, ie: new volume setup
+        # config_changed_volume_apply will stop the service if it finds
+        # it necessary, ie: new volume setup
         if config_changed_volume_apply():
             start_hook()
         else:
@@ -769,8 +771,9 @@
 
     # current ports
     current_mongodb_port = re.search('^#*port\s+=\s+(\w+)',
-        mongodb_config,
-        re.MULTILINE).group(1)
+                                     mongodb_config,
+                                     re.MULTILINE).group(1)
+
     current_web_admin_ui_port = int(current_mongodb_port) + 1000
     new_web_admin_ui_port = int(config_data['port']) + 1000
 
@@ -816,13 +819,14 @@
     # arbiter
     if config_data['replicaset_master'] != 'auto':
         if config_data['arbiter'] != "disabled" and\
-        config_data['replicaset_master'] != "auto":
+           config_data['replicaset_master'] != "auto":
             if config_data['arbiter'] == 'enable':
                 enable_arbiter(config_data['replicaset_master'],
-                "%s:%s" % (private_address, config_data['port']))
+                               "%s:%s" % (private_address,
+                                          config_data['port']))
             else:
                 enable_arbiter(config_data['replicaset_master'],
-                config_data['arbiter'])
+                               config_data['arbiter'])
 
     # expose necessary ports
     update_service_ports([current_mongodb_port], [config_data['port']])
@@ -883,7 +887,7 @@
     try:
         retVal = service('stop', 'mongodb')
         os.remove('/var/lib/mongodb/mongod.lock')
-        #FIXME Need to check if this is still needed
+        # FIXME Need to check if this is still needed
     except Exception, e:
         juju_log(str(e))
         retVal = False
@@ -901,13 +905,13 @@
     juju_log("my_hostname: %s" % my_hostname)
     juju_log("my_port: %s" % my_port)
     juju_log("my_replset: %s" % my_replset)
-    return(relation_set(relation_id(),
-        {
-            'hostname': my_hostname,
-            'port': my_port,
-            'replset': my_replset,
-            'type': 'database',
-        }))
+
+    return(relation_set(relation_id(), {
+        'hostname': my_hostname,
+        'port': my_port,
+        'replset': my_replset,
+        'type': 'database',
+    }))
 
 
 @hooks.hook('replicaset-relation-joined')
@@ -1014,19 +1018,19 @@
     juju_log("data_relation_departed")
     return(config_changed())
 
+
 @hooks.hook('configsvr-relation-joined')
 def configsvr_relation_joined():
     juju_log("configsvr_relation_joined")
     my_hostname = unit_get('private-address')
     my_port = config('config_server_port')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
-    relation_set(relation_id(),
-                        {
-                            'hostname': my_hostname,
-                            'port': my_port,
-                            'install-order': my_install_order,
-                            'type': 'configsvr',
-                        })
+    relation_set(relation_id(), {
+        'hostname': my_hostname,
+        'port': my_port,
+        'install-order': my_install_order,
+        'type': 'configsvr',
+    })
 
 
 @hooks.hook('configsvr-relation-changed')
@@ -1044,13 +1048,12 @@
     my_hostname = unit_get('private-address')
     my_port = config('mongos_port')
     my_install_order = os.environ['JUJU_UNIT_NAME'].split('/')[1]
-    relation_set(relation_id(),
-                 {
-                     'hostname': my_hostname,
-                     'port': my_port,
-                     'install-order': my_install_order,
-                     'type': 'mongos'
-                 })
+    relation_set(relation_id(), {
+        'hostname': my_hostname,
+        'port': my_port,
+        'install-order': my_install_order,
+        'type': 'mongos'
+    })
 
 
 @hooks.hook('mongos-cfg-relation-changed')
@@ -1070,10 +1073,11 @@
         config_servers = load_config_servers(default_mongos_list)
         print "Adding config server: %s:%s" % (hostname, port)
         if hostname is not None and \
-        port is not None and \
-        hostname != '' and \
-        port != '' and \
-        "%s:%s" % (hostname, port) not in config_servers:
+           port is not None and \
+           hostname != '' and \
+                       port != '' and \
+                               "%s:%s" % (hostname,
+                                          port) not in config_servers:
             config_servers.append("%s:%s" % (hostname, port))
         disable_mongos(config_data['mongos_port'])
         retVal = enable_mongos(config_data, config_servers)
@@ -1088,12 +1092,12 @@
             mongo_client(mongos_host, shard_command1)
             replicaset = relation_get('replset')
             shard_command2 = "sh.addShard(\"%s/%s:%s\")" %  \
-            (replicaset, hostname, port)
+                             (replicaset, hostname, port)
             mongo_client(mongos_host, shard_command2)
 
     else:
         print("mongos_relation_change: undefined rel_type: %s" %
-                 rel_type)
+              rel_type)
         return
 
     print("mongos_relation_changed returns: %s" % retVal)
@@ -1128,12 +1132,11 @@
 ###############################################################################
 # Volume managment
 ###############################################################################
-#------------------------------
+#
 # Get volume-id from juju config "volume-map" dictionary as
 #     volume-map[JUJU_UNIT_NAME]
 # @return  volid
 #
-#------------------------------
 def volume_get_volid_from_volume_map():
     config_data = config()
     volume_map = {}
@@ -1158,48 +1161,40 @@
     return False
 
 
-#------------------------------
 # Returns a mount point from passed vol-id, e.g. /srv/juju/vol-000012345
 #
 # @param  volid          volume id (as e.g. EBS volid)
 # @return mntpoint_path  eg /srv/juju/vol-000012345
-#------------------------------
 def volume_mount_point_from_volid(volid):
     if volid and volume_is_permanent(volid):
         return "/srv/juju/%s" % volid
     return None
 
 
-#------------------------------
 # Returns a stub volume id based on the mountpoint from the storage
 # subordinate relation, if present.
 #
 # @return volid  eg vol-000012345
-#------------------------------
 def volume_get_id_for_storage_subordinate():
     # storage charm is a subordinate so we should only ever have one
     # relation_id for the data relation
     ids = relation_ids('data')
     if len(ids) > 0:
         mountpoint = relation_get('mountpoint',
-                                   os.environ['JUJU_UNIT_NAME'],
-                                   ids[0])
+                                  os.environ['JUJU_UNIT_NAME'],
+                                  ids[0])
 
         juju_log('mountpoint: %s' % (mountpoint,))
         if mountpoint and os.path.exists(mountpoint):
             return mountpoint.split('/')[-1]
 
 
-
 # Do we have a valid storage state?
 # @returns  volid
 #           None    config state is invalid - we should not serve
 def volume_get_volume_id():
 
     config_data = config()
-
-
-
     volid = volume_get_id_for_storage_subordinate()
     if volid:
         return volid
@@ -1244,7 +1239,7 @@
     return output
 
 
-#------------------------------------------------------------------------------
+#
 # Core logic for permanent storage changes:
 # NOTE the only 2 "True" return points:
 #   1) symlink already pointing to existing storage (no-op)
@@ -1253,7 +1248,7 @@
 #       mounts it to e.g.:  /srv/juju/vol-000012345
 #     - if fresh new storage dir: rsync existing data
 #     - manipulate /var/lib/mongodb/VERSION/CLUSTER symlink
-#------------------------------------------------------------------------------
+#
 def config_changed_volume_apply():
     config_data = config()
     data_directory_path = config_data["dbpath"]
@@ -1283,7 +1278,8 @@
         if os.path.islink(data_directory_path):
             juju_log(
                 "mongodb data dir '%s' already points "
-                "to %s, skipping storage changes." % (data_directory_path, new_mongo_dir))
+                "to %s, skipping storage changes." % (data_directory_path,
+                                                      new_mongo_dir))
             juju_log(
                 "existing-symlink: to fix/avoid UID changes from "
                 "previous units, doing: "
@@ -1337,11 +1333,9 @@
     return False
 
 
-#------------------------------------------------------------------------------
 # Write mongodb-server logrotate configuration
-#------------------------------------------------------------------------------
 def write_logrotate_config(config_data,
-                           conf_file = '/etc/logrotate.d/mongodb-server'):
+                           conf_file='/etc/logrotate.d/mongodb-server'):
 
     juju_log('Writing {}.'.format(conf_file))
     contents = dedent("""

=== added file 'test_requirements.txt'
--- test_requirements.txt	1970-01-01 00:00:00 +0000
+++ test_requirements.txt	2014-12-09 18:51:40 +0000
@@ -0,0 +1,5 @@
+coverage>=3.6
+mock>=1.0.1
+nose>=1.3.1
+flake8
+

=== removed file 'tests/00-setup'
--- tests/00-setup	2014-11-20 14:55:49 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-sudo apt-get install python-setuptools -y
-sudo add-apt-repository ppa:juju/stable -y
-
-sudo apt-get update
-
-
-sudo apt-get install amulet python3 python3-requests python3-pymongo python-mock juju-core charm-tools -y

=== added file 'tests/00_setup.sh'
--- tests/00_setup.sh	1970-01-01 00:00:00 +0000
+++ tests/00_setup.sh	2014-12-09 18:51:40 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+sudo apt-get install python-setuptools -y
+sudo add-apt-repository ppa:juju/stable -y
+
+sudo apt-get update
+sudo apt-get install amulet python3 python3-requests python3-pymongo juju-core charm-tools python-mock python-pymongo -y

=== added file 'tests/01_deploy_test.py'
--- tests/01_deploy_test.py	1970-01-01 00:00:00 +0000
+++ tests/01_deploy_test.py	2014-12-09 18:51:40 +0000
@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+from pymongo import MongoClient
+
+#########################################################
+# Test Quick Config
+#########################################################
+scale = 1
+seconds = 1400
+
+#########################################################
+# 3shard cluster configuration
+#########################################################
+d = amulet.Deployment(series='trusty')
+
+d.add('configsvr', charm='mongodb', units=scale)
+d.add('mongos', charm='mongodb', units=scale)
+d.add('shard1', charm='mongodb', units=scale)
+d.add('shard2', charm='mongodb', units=scale)
+
+# Setup the config svr
+d.configure('configsvr', {'replicaset': 'configsvr'})
+
+# define each shardset
+d.configure('shard1', {'replicaset': 'shard1'})
+d.configure('shard2', {'replicaset': 'shard2'})
+
+d.configure('mongos', {})
+
+# Connect the config servers to mongo shell
+d.relate('configsvr:configsvr', 'mongos:mongos-cfg')
+
+# connect each shard to the mongo shell
+d.relate('mongos:mongos', 'shard1:database')
+d.relate('mongos:mongos', 'shard2:database')
+d.expose('configsvr')
+d.expose('mongos')
+
+# Perform the setup for the deployment.
+try:
+    d.setup(seconds)
+    d.sentry.wait(seconds)
+except amulet.helpers.TimeoutError:
+    message = 'The environment did not setup in %d seconds.', seconds
+    amulet.raise_status(amulet.SKIP, msg=message)
+except:
+    raise
+
+sentry_dict = {
+    'config-sentry': d.sentry.unit['configsvr/0'],
+    'mongos-sentry': d.sentry.unit['mongos/0'],
+    'shard1-sentry': d.sentry.unit['shard1/0'],
+    'shard2-sentry': d.sentry.unit['shard2/0']
+}
+
+
+#############################################################
+# Check presence of MongoDB GUI HEALTH Status
+#############################################################
+def validate_status_interface():
+    r = requests.get("http://{}:28017".format(
+        sentry_dict['config-sentry'].info['public-address']),
+        verify=False)
+    r.raise_for_status
+
+
+#############################################################
+# Validate that each unit has an active mongo service
+#############################################################
+def validate_running_services():
+    for service in sentry_dict:
+        output = sentry_dict[service].run('service mongodb status')
+        service_active = str(output).find('mongodb start/running')
+        if service_active == -1:
+            message = "Failed to find running MongoDB on host {}".format(
+                service)
+            amulet.raise_status(amulet.SKIP, msg=message)
+
+
+#############################################################
+# Validate connectivity from $WORLD
+#############################################################
+def validate_world_connectivity():
+    client = MongoClient(d.sentry.unit['mongos/0'].info['public-address'])
+
+    db = client['test']
+    # Can we successfully insert?
+    insert_id = db.amulet.insert({'assert': True})
+    if insert_id is None:
+        amulet.raise_status(amulet.FAIL, msg="Failed to insert test data")
+    # Can we delete from a shard using the Mongos hub?
+    result = db.amulet.remove(insert_id)
+    if result['err'] is not None:
+        amulet.raise_status(amulet.FAIL, msg="Failed to remove test data")
+
+
+#############################################################
+# Validate relationships
+#############################################################
+# broken pending 1273312
+def validate_relationships():
+    d.sentry.unit['configsvr/0'].relation('configsvr', 'mongos:mongos-cfg')
+    d.sentry.unit['shard1/0'].relation('database', 'mongos:mongos')
+    d.sentry.unit['shard2/0'].relation('database', 'mongos:mongos')
+    print(d.sentry.unit['shard1/0'].relation('database', 'mongos:mongos'))
+
+
+def validate_manual_connection():
+    output, code = d.sentry.unit['shard1/0'].run("mongo {}".format(
+        d.sentry.unit['mongos/0'].info['public-address']))
+    if code != 0:
+        message = "Manual Connection failed for unit shard1"
+        amulet.raise_status(amulet.SKIP, msg=message)
+
+    output, code = d.sentry.unit['shard2/0'].run("mongo {}".format(
+        d.sentry.unit['mongos/0'].info['public-address']))
+    if code != 0:
+        message = "Manual Connection failed for unit shard2"
+        amulet.raise_status(amulet.SKIP, msg=message)
+
+
+validate_status_interface()
+validate_running_services()
+validate_manual_connection()
+validate_world_connectivity()

=== removed file 'tests/01_test_write_log_rotate_config.py'
--- tests/01_test_write_log_rotate_config.py	2014-11-04 18:23:06 +0000
+++ tests/01_test_write_log_rotate_config.py	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-import mock
-import os
-import unittest
-import tempfile
-import sys
-sys.path.append('hooks')
-import hooks
-
-
-class TestWriteLogrotateConfigFile(unittest.TestCase):
-
-    def test_success(self):
-        logpath = '/tmp/foo/foo.log'
-        config_data = {
-            'logpath': logpath,
-            'logrotate-frequency': 'daily',
-            'logrotate-maxsize': '5G',
-            'logrotate-rotate': 5,
-        }
-        fd, temp_fn = tempfile.mkstemp()
-        os.close(fd)
-        with mock.patch('hooks.juju_log') as mock_juju_log:
-            with mock.patch('hooks.open', create=True) as mock_open:
-                mock_open.return_value = mock.MagicMock(spec=file)
-                hooks.write_logrotate_config(config_data, temp_fn)
-                os.unlink(temp_fn)
-        mock_juju_log.assert_called_once_with('Writing {}.'.format(temp_fn))
-        mock_open.assert_called_once_with(temp_fn, 'w')
-        mock_file = mock_open().__enter__()
-        call_args = mock_file.write.call_args[0][0]
-        self.assertTrue(mock_file.write.called)
-        self.assertIn(logpath, call_args)
-        self.assertIn('daily', call_args)
-        self.assertIn('maxsize 5G', call_args)
-        self.assertIn('rotate 5', call_args)
-
-
-if __name__ == '__main__':
-    unittest.main()

=== added file 'tests/02_relate_ceilometer_test.py'
--- tests/02_relate_ceilometer_test.py	1970-01-01 00:00:00 +0000
+++ tests/02_relate_ceilometer_test.py	2014-12-09 18:51:40 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import amulet
+
+
+class TestDeploy(object):
+
+    def __init__(self, time=2500):
+        # Attempt to load the deployment topology from a bundle.
+        self.deploy = amulet.Deployment(series="trusty")
+
+        # If something errored out, attempt to continue by
+        # manually specifying a standalone deployment
+        self.deploy.add('mongodb')
+        self.deploy.add('ceilometer', 'cs:trusty/ceilometer')
+        # send blank configs to finalize the objects in the deployment map
+        self.deploy.configure('mongodb', {})
+        self.deploy.configure('ceilometer', {})
+
+        self.deploy.relate('mongodb:database', 'ceilometer:shared-db')
+
+        try:
+            self.deploy.setup(time)
+            self.deploy.sentry.wait(time)
+        except:
+            amulet.raise_status(amulet.FAIL, msg="Environment standup timeout")
+        # sentry = self.deploy.sentry
+
+    def run(self):
+        for test in dir(self):
+            if test.startswith('test_'):
+                getattr(self, test)()
+
+    def test_mongo_relation(self):
+        unit = self.deploy.sentry.unit['ceilometer/0']
+        mongo = self.deploy.sentry.unit['mongodb/0'].info['public-address']
+        cont = unit.file_contents('/etc/ceilometer/ceilometer.conf')
+        if mongo not in cont:
+            amulet.raise_status(amulet.FAIL, "Unable to verify ceilometer cfg")
+
+if __name__ == '__main__':
+    runner = TestDeploy()
+    runner.run()

=== removed file 'tests/200_deploy.test'
--- tests/200_deploy.test	2014-11-04 22:25:26 +0000
+++ tests/200_deploy.test	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-#!/usr/bin/env python3
-
-import amulet
-import requests
-from pymongo import MongoClient
-
-#########################################################
-# Test Quick Config
-#########################################################
-scale = 1
-seconds = 2500
-
-#########################################################
-# 3shard cluster configuration
-#########################################################
-d = amulet.Deployment(series='trusty')
-
-d.add('configsvr', charm='mongodb', units=scale)
-d.add('mongos', charm='mongodb', units=scale)
-d.add('shard1', charm='mongodb', units=scale)
-d.add('shard2', charm='mongodb', units=scale)
-
-#Setup the config svr
-d.configure('configsvr', {'replicaset': 'configsvr'})
-
-# define each shardset
-d.configure('shard1', {'replicaset': 'shard1'})
-d.configure('shard2', {'replicaset': 'shard2'})
-
-d.configure('mongos', {})
-
-#Connect the config servers to mongo shell
-d.relate('configsvr:configsvr', 'mongos:mongos-cfg')
-
-#connect each shard to the mongo shell
-d.relate('mongos:mongos', 'shard1:database')
-d.relate('mongos:mongos', 'shard2:database')
-d.expose('configsvr')
-d.expose('mongos')
-
-# Perform the setup for the deployment.
-try:
-    d.setup(seconds)
-    d.sentry.wait(seconds)
-except amulet.helpers.TimeoutError:
-    message = 'The environment did not setup in %d seconds.', seconds
-    amulet.raise_status(amulet.SKIP, msg=message)
-except:
-    raise
-
-sentry_dict = {
-    'config-sentry': d.sentry.unit['configsvr/0'],
-    'mongos-sentry': d.sentry.unit['mongos/0'],
-    'shard1-sentry': d.sentry.unit['shard1/0'],
-    'shard2-sentry': d.sentry.unit['shard2/0']
-}
-
-
-#############################################################
-# Check presence of MongoDB GUI HEALTH Status
-#############################################################
-def validate_status_interface():
-    r = requests.get("http://{}:28017".format(
-        sentry_dict['config-sentry'].info['public-address']),
-        verify=False)
-    r.raise_for_status
-
-
-#############################################################
-# Validate that each unit has an active mongo service
-#############################################################
-def validate_running_services():
-    for service in sentry_dict:
-        output = sentry_dict[service].run('service mongodb status')
-        service_active = str(output).find('mongodb start/running')
-        if service_active == -1:
-            message = "Failed to find running MongoDB on host {}".format(service)
-            amulet.raise_status(amulet.SKIP, msg=message)
-
-
-#############################################################
-# Validate connectivity from $WORLD
-#############################################################
-def validate_world_connectivity():
-    client = MongoClient(d.sentry.unit['mongos/0'].info['public-address'])
-
-    db = client['test']
-    #Can we successfully insert?
-    insert_id = db.amulet.insert({'assert': True})
-    if insert_id is None:
-        amulet.raise_status(amulet.FAIL, msg="Failed to insert test data")
-    #Can we delete from a shard using the Mongos hub?
-    result = db.amulet.remove(insert_id)
-    if result['err'] is not None:
-        amulet.raise_status(amulet.FAIL, msg="Failed to remove test data")
-
-
-#############################################################
-# Validate relationships
-#############################################################
-#broken pending 1273312
-def validate_relationships():
-    d.sentry.unit['configsvr/0'].relation('configsvr', 'mongos:mongos-cfg')
-    d.sentry.unit['shard1/0'].relation('database', 'mongos:mongos')
-    d.sentry.unit['shard2/0'].relation('database', 'mongos:mongos')
-    print(d.sentry.unit['shard1/0'].relation('database', 'mongos:mongos'))
-
-
-def validate_manual_connection():
-    output, code = d.sentry.unit['shard1/0'].run("mongo {}".format(
-        d.sentry.unit['mongos/0'].info['public-address']))
-    if code != 0:
-        message = "Manual Connection failed for unit shard1"
-        amulet.raise_status(amulet.SKIP, msg=message)
-
-    output, code = d.sentry.unit['shard2/0'].run("mongo {}".format(
-        d.sentry.unit['mongos/0'].info['public-address']))
-    if code != 0:
-        message = "Manual Connection failed for unit shard2"
-        amulet.raise_status(amulet.SKIP, msg=message)
-
-
-validate_status_interface()
-validate_running_services()
-#validate_relationships()
-validate_manual_connection()
-validate_world_connectivity()

=== removed file 'tests/200_relate_ceilometer.test'
--- tests/200_relate_ceilometer.test	2014-11-04 22:07:36 +0000
+++ tests/200_relate_ceilometer.test	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-import subprocess
-import amulet
-
-
-class TestDeploy(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        time = 2500
-
-        d = amulet.Deployment(series="trusty")
-        d.add('mongodb')
-        d.add('ceilometer', 'cs:trusty/ceilometer')
-        d.relate('mongodb:database', 'ceilometer:shared-db')
-        d.expose('mongodb')
-
-        try:
-            d.setup(time)
-            d.sentry.wait(time)
-        except amulet.helpers.TimeoutError:
-            amulet.raise_status(amulet.FAIL, msg="Environment standup timeout")
-        except:
-            raise
-
-        cls.mongo = d.sentry['mongodb/0']
-        cls.ceilometer = d.sentry['ceilometer/0']
-        cls.deployment = d
-
-    def test_mongo_relation(self):
-        """Test that ceilometer config contains mongo host address"""
-        mongo_private_address, _ = self.mongo.run('unit-get private-address')
-        conf = self.ceilometer.file_contents('/etc/ceilometer/ceilometer.conf')
-        self.assertTrue(mongo_private_address in conf)
-
-    def test_port_change(self):
-        """Test that mongo can be reached on its configured port"""
-        host = self.mongo.info['public-address']
-        netcat = 'nc {} {} </dev/null'
-
-        def check_port(port):
-            self.deployment.configure('mongodb', {'port': port})
-            self.deployment.sentry.wait()
-            return subprocess.call(netcat.format(host, port), shell=True)
-
-        self.assertEqual(0, check_port(55555))
-        self.assertEqual(0, check_port(27017))
-
-
-if __name__ == '__main__':
-    unittest.main()

=== added directory 'unit_tests'
=== added file 'unit_tests/test_write_log_rotate_config.py'
--- unit_tests/test_write_log_rotate_config.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_write_log_rotate_config.py	2014-12-09 18:51:40 +0000
@@ -0,0 +1,35 @@
+import mock
+import os
+import unittest
+import tempfile
+import sys
+sys.path.append('hooks')
+import hooks
+
+
+class TestWriteLogrotateConfigFile(unittest.TestCase):
+
+    def test_success(self):
+        logpath = '/tmp/foo/foo.log'
+        config_data = {
+            'logpath': logpath,
+            'logrotate-frequency': 'daily',
+            'logrotate-maxsize': '5G',
+            'logrotate-rotate': 5,
+        }
+        fd, temp_fn = tempfile.mkstemp()
+        os.close(fd)
+        with mock.patch('hooks.juju_log') as mock_juju_log:
+            with mock.patch('hooks.open', create=True) as mock_open:
+                mock_open.return_value = mock.MagicMock(spec=file)
+                hooks.write_logrotate_config(config_data, temp_fn)
+                os.unlink(temp_fn)
+        mock_juju_log.assert_called_once_with('Writing {}.'.format(temp_fn))
+        mock_open.assert_called_once_with(temp_fn, 'w')
+        mock_file = mock_open().__enter__()
+        call_args = mock_file.write.call_args[0][0]
+        self.assertTrue(mock_file.write.called)
+        self.assertIn(logpath, call_args)
+        self.assertIn('daily', call_args)
+        self.assertIn('maxsize 5G', call_args)
+        self.assertIn('rotate 5', call_args)