Merge branch 'netslice'

Change-Id: Id030ead323e2a89acb43e8c7352b9b50d5717f17
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/Dockerfile.local b/Dockerfile.local
index e5bdb86..dcef067 100644 (file)
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -19,7 +19,7 @@ FROM ubuntu:16.04
 WORKDIR /app/osm_lcm
 
 # Copy the current directory contents into the container at /app
-#ADD . /app
+ADD . /app  # TODO move to the end
 
 RUN apt-get update && apt-get install -y git tox python3 \
     python3-pip python3-aiohttp \
@@ -82,7 +82,7 @@ ENV OSMLCM_MESSAGE_PORT    9092
 ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
 ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 
-ADD . /app
+# ADD . /app
 
 # Run app.py when the container launches
 CMD ["python3", "lcm.py"]

diff --git a/osm_lcm/ROclient.py b/osm_lcm/ROclient.py
index 1fd5f95..d0bef33 100644 (file)
--- a/osm_lcm/ROclient.py
+++ b/osm_lcm/ROclient.py
@@ -99,7 +99,7 @@ def remove_envelop(item, indata=None):
 class ROClient:
     headers_req = {'Accept': 'application/yaml', 'content-type': 'application/yaml'}
     client_to_RO = {'tenant': 'tenants', 'vim': 'datacenters', 'vim_account': 'datacenters', 'sdn': 'sdn_controllers',
-                    'vnfd': 'vnfs', 'nsd': 'scenarios', 
+                    'vnfd': 'vnfs', 'nsd': 'scenarios',
                     'ns': 'instances'}
     mandatory_for_create = {
         'tenant': ("name", ),
@@ -757,7 +757,7 @@ class ROClient:
     async def create(self, item, descriptor=None, descriptor_format=None, **kwargs):
         """
         Creates an item from its descriptor
-        :param item: can be 'tenant', 'vnfd', 'nsd', 'ns', 'vim', 'vim_account', 'sdn', nstd
+        :param item: can be 'tenant', 'vnfd', 'nsd', 'ns', 'vim', 'vim_account', 'sdn'
         :param descriptor: can be a dict, or a yaml/json text. Autodetect unless descriptor_format is provided
         :param descriptor_format: Can be 'json' or 'yaml'
         :param kwargs: Overrides descriptor with values as name, description, vim_url, vim_url_admin, vim_type

diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index d4a09db..ff90ff1 100644 (file)
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -28,8 +28,8 @@ min_RO_version = [0, 5, 72]
 min_n2vc_version = "0.0.2"
 min_common_version = "0.1.11"
 # uncomment if LCM is installed as library and installed, and get them from __init__.py
-lcm_version = '0.1.23'
-lcm_version_date = '2018-11-13'
+lcm_version = '0.1.24'
+lcm_version_date = '2018-11-16'
 
 
 class Lcm: