Merge "Fix bug 564"

diff --combined n2vc/vnf.py
index 9cdbb33,2830571..1bdfe2f
--- 1/n2vc/vnf.py
--- 2/n2vc/vnf.py
+++ b/n2vc/vnf.py
@@@ -769,11 -769,11 +769,11 @@@ class N2VC
  
                  await self.disconnect_model(self.monitors[model_name])
  
-                 # Notify the callback that this charm has been removed.
                  self.notify_callback(
                      model_name,
                      application_name,
                      "removed",
+                     "Removing charm {}".format(application_name),
                      callback,
                      *callback_args,
                  )
@@@ -805,10 -805,6 +805,10 @@@
              except JujuError as e:
                  if "already exists" not in e.message:
                      raise e
 +
 +            # Create an observer for this model
 +            await self.create_model_monitor(ns_uuid)
 +
          return True
  
      async def DestroyNetworkService(self, ns_uuid):
@@@ -823,7 -819,7 +823,7 @@@
  
          # Do not delete the default model. The default model was used by all
          # Network Services, prior to the implementation of a model per NS.
-         if ns_uuid.lower() is "default":
+         if ns_uuid.lower() == "default":
              return False
  
          if not self.authenticated:
@@@ -836,7 -832,7 +836,7 @@@
  
          try:
              await self.controller.destroy_models(ns_uuid)
-         except JujuError as e:
+         except JujuError:
              raise NetworkServiceDoesNotExist(
                  "The Network Service '{}' does not exist".format(ns_uuid)
              )
@@@ -1065,20 -1061,10 +1065,20 @@@
              self.refcount['model'] += 1
  
              # Create an observer for this model
 +            await self.create_model_monitor(model_name)
 +
 +        return self.models[model_name]
 +
 +    async def create_model_monitor(self, model_name):
 +        """Create a monitor for the model, if none exists."""
 +        if not self.authenticated:
 +            await self.login()
 +
 +        if model_name not in self.monitors:
              self.monitors[model_name] = VCAMonitor(model_name)
              self.models[model_name].add_observer(self.monitors[model_name])
  
 -        return self.models[model_name]
 +        return True
  
      async def login(self):
          """Login to the Juju controller."""

diff --combined tests/base.py
index 41fa191,4d26a7f..3ae5f4f
--- 1/tests/base.py
--- 2/tests/base.py
+++ b/tests/base.py
@@@ -568,12 -568,17 +568,17 @@@ class TestN2VC(object)
                      )
                      subprocess.check_call(shlex.split(cmd))
  
-                 self.artifacts[charm] = {
-                     'tmpdir': builds,
-                     'charm': "{}/builds/{}".format(builds, charm),
-                 }
              except subprocess.CalledProcessError as e:
-                 raise Exception("charm build failed: {}.".format(e))
+                 # charm build will return error code 100 if the charm fails
+                 # the auto-run of charm proof, which we can safely ignore for
+                 # our CI charms.
+                 if e.returncode != 100:
+                     raise Exception("charm build failed: {}.".format(e))
+ 
+             self.artifacts[charm] = {
+                 'tmpdir': builds,
+                 'charm': "{}/builds/{}".format(builds, charm),
+             }
  
          return self.artifacts[charm]['charm']
  
@@@ -586,9 -591,6 +591,9 @@@
          if not self.n2vc:
              self.n2vc = get_n2vc(loop=loop)
  
 +        debug("Creating model for Network Service {}".format(self.ns_name))
 +        await self.n2vc.CreateNetworkService(self.ns_name)
 +
          application = self.n2vc.FormatApplicationName(
              self.ns_name,
              self.vnf_name,
@@@ -892,8 -894,6 +897,8 @@@
                  try:
                      await self.n2vc.RemoveCharms(self.ns_name, application)
  
 +                    await self.n2vc.DestroyNetworkService(self.ns_name)
 +
                      while True:
                          # Wait for the application to be removed
                          await asyncio.sleep(10)
@@@ -902,6 -902,7 +907,7 @@@
                              application,
                          ):
                              break
+                     await self.n2vc.DestroyNetworkService(self.ns_name)
  
                      # Need to wait for the charm to finish, because native charms
                      if self.state[application]['container']: