From: israelad <adam.israel@canonical.com>
Date: Fri, 2 Nov 2018 17:18:55 +0000 (+0100)
Subject: Merge "fix minor error"
X-Git-Tag: v5.0.0~3
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=commitdiff_plain;h=ee41df85fe2424b32e3504162360f372ba09bfb8;hp=-c

Merge "fix minor error"
---

ee41df85fe2424b32e3504162360f372ba09bfb8
diff --combined n2vc/vnf.py
index 4427c9b,e03cca9..afd2501
--- a/n2vc/vnf.py
+++ b/n2vc/vnf.py
@@@ -494,12 -494,11 +494,12 @@@ class N2VC
          # #######################################
          # # Execute initial config primitive(s) #
          # #######################################
 -        await self.ExecuteInitialPrimitives(
 +        uuids = await self.ExecuteInitialPrimitives(
              model_name,
              application_name,
              params,
          )
 +        return uuids
  
          # primitives = {}
          #
@@@ -894,11 -893,11 +894,11 @@@
          params = {}
          for parameter in parameters:
              param = str(parameter['name'])
+             value = None
  
              # Typecast parameter value, if present
              if 'data-type' in parameter:
                  paramtype = str(parameter['data-type']).lower()
-                 value = None
  
                  if paramtype == "integer":
                      value = int(parameter['value'])
@@@ -927,6 -926,7 +927,6 @@@
  
          return config
  
 -    @staticmethod
      def FormatApplicationName(self, *args):
          """
          Generate a Juju-compatible Application name
@@@ -942,6 -942,7 +942,6 @@@
  
              FormatApplicationName("ping_pong_ns", "ping_vnf", "a")
          """
 -
          appname = ""
          for c in "-".join(list(args)):
              if c.isdigit():