X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=charms%2Flayers%2Fopenmano%2Freactive%2Flayer_openmano.py;h=2320e9185c9151fd39fbc356968ec394002636ac;hb=refs%2Fchanges%2F91%2F691%2F1;hp=96bd4206923a5d8874ad73eff1ab4753965ad739;hpb=50227af7528fd544826a238ddab7d40746f6873d;p=osm%2FRO.git

diff --git a/charms/layers/openmano/reactive/layer_openmano.py b/charms/layers/openmano/reactive/layer_openmano.py
index 96bd4206..2320e918 100644
--- a/charms/layers/openmano/reactive/layer_openmano.py
+++ b/charms/layers/openmano/reactive/layer_openmano.py
@@ -32,17 +32,18 @@ INSTALL_PATH = '/opt/openmano'
 USER = 'openmanod'
 
 
-@when('openmano.installed')
-@when('openmano.available')
+@when('openmano.installed', 'openmano.available')
 def openmano_available(openmano):
     # TODO make this configurable via charm config
     openmano.configure(port=9090)
 
 
-@when('openmano.installed')
-@when('db.available', 'db.installed')
-@when('openvim-controller.available')
-@when('openmano.running')
+@when('openvim-controller.available',
+      'db.available',
+      'db.installed',
+      'openmano.installed',
+      'openmano.running',
+      )
 def openvim_available(openvim, db):
     for service in openvim.services():
         for endpoint in service['hosts']:
@@ -54,7 +55,6 @@ def openvim_available(openvim, db):
             if kvdb.get('openvim_uri') == openvim_uri:
                 return
 
-            import pdb; pdb.set_trace()
             # TODO: encapsulate the logic in create-datacenter.sh into python
             try:
                 cmd = './scripts/create-datacenter.sh {} {} {} {}'.format(
@@ -72,9 +72,9 @@ def openvim_available(openvim, db):
         break
 
 
-@when('openmano.installed')
-@when('db.available', 'db.installed')
-@when('openvim-controller.available')
+@when('openmano.installed',
+      'db.installed',
+      'openvim-controller.available')
 @when_not('openmano.running')
 def start(*args):
     # TODO: if the service fails to start, we should raise an error to the op
@@ -96,8 +96,7 @@ def start(*args):
     set_state('openmano.running')
 
 
-@when('openmano.installed')
-@when('db.available')
+@when('db.available', 'openmano.installed')
 @when_not('db.installed')
 def setup_db(db):
     """Setup the database
@@ -152,6 +151,7 @@ def setup_db(db):
     status_set('active', 'Database installed.')
     set_state('db.installed')
 
+
 @when_not('openvim-controller.available')
 def need_openvim():
     status_set('waiting', 'Waiting for OpenVIM')