Merge "Bug 502 improvements"

diff --combined n2vc/vnf.py
index d6c87dc,eb25c5c..1b9efa8
--- 1/n2vc/vnf.py
--- 2/n2vc/vnf.py
+++ b/n2vc/vnf.py
@@@ -297,7 -297,7 +297,7 @@@ class N2VC
          ########################################
          app = await self.get_application(model, application_name)
          if app:
 -            raise JujuApplicationExists("Can't deploy application \"{}\" to model \"{}\" because it already exists.".format(application_name, model))
 +            raise JujuApplicationExists("Can't deploy application \"{}\" to model \"{}\" because it already exists.".format(application_name, model_name))
  
          ################################################################
          # Register this application with the model-level event monitor #
@@@ -375,14 -375,10 +375,14 @@@
                  else:
                      seq = primitive['seq']
  
 +                    params = {}
 +                    if 'parameter' in primitive:
 +                        params = primitive['parameter']
 +
                      primitives[seq] = {
                          'name': primitive['name'],
                          'parameters': self._map_primitive_parameters(
 -                            primitive['parameter'],
 +                            params,
                              {'<rw_mgmt_ip>': rw_mgmt_ip}
                          ),
                      }
@@@ -397,7 -393,7 +397,7 @@@
                              **primitives[primitive]['parameters'],
                          )
              except N2VCPrimitiveExecutionFailed as e:
-                 self.debug.log(
+                 self.log.debug(
                      "[N2VC] Exception executing primitive: {}".format(e)
                  )
                  raise
@@@ -447,7 -443,7 +447,7 @@@
                  await model.disconnect()
          except Exception as e:
              self.log.debug("Caught exception while executing primitive: {}".format(e))
-             raise e
+             raise N2VCPrimitiveExecutionFailed(e)
          return uuid
  
      async def RemoveCharms(self, model_name, application_name, callback=None, *callback_args):