validation using pyangbind

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

diff --git a/Dockerfile.local b/Dockerfile.local
index 154e4ae..1ec838a 100644 (file)
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -9,16 +9,25 @@ WORKDIR /app/osm_nbi
 ADD . /app
 
 RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
 ADD . /app
 
 RUN apt-get update && apt-get install -y git python3 python3-jsonschema \

-    python3-cherrypy3 python3-pymongo python3-yaml python3-pip \
+    python3-pymongo python3-yaml python3-pip \

     && pip3 install pip==9.0.3 \
     && pip3 install pip==9.0.3 \

-    && pip3 install aiokafka \
+    && pip3 install aiokafka cherrypy \

     && mkdir -p /app/storage/kafka && mkdir -p /app/log 
     && mkdir -p /app/storage/kafka && mkdir -p /app/log 

+
+# OSM_COMMON

 RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
     && cd common  && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..
 
 RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
     && cd common  && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..
 

-
+# OSM_IM
+RUN pip3 install pyang && mkdir -p /app && cd /app \
+    && git clone https://github.com/robshakir/pyangbind \
+    && pip3 install -e pyangbind \
+    && git clone  https://osm.etsi.org/gerrit/osm/IM \
+    && cd /app/IM/models/yang \
+    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/vnfd_catalog.py vnfd.yang \
+    && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/nsd_catalog.py nsd.yang

 
 EXPOSE 9999
 
 
 EXPOSE 9999
 

diff --git a/osm_nbi/html_public/version b/osm_nbi/html_public/version
index 9dd5ce5..e2b889d 100644 (file)
--- a/osm_nbi/html_public/version
+++ b/osm_nbi/html_public/version
@@ -1,3 +1,3 @@
-0.1.12
-2018-07-02
+0.1.13
+2018-07-03

 
 

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index 796558d..3cc12b9 100644 (file)
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -196,7 +196,7 @@ class Server(object):
                                              "<ID>": {"METHODS": ("GET", "PUT", "DELETE")}
                                              },
                     "vnf_packages": {"METHODS": ("GET", "POST"),
                                              "<ID>": {"METHODS": ("GET", "PUT", "DELETE")}
                                              },
                     "vnf_packages": {"METHODS": ("GET", "POST"),

-                                     "<ID>": {"METHODS": ("GET", "DELETE"), "TODO": "PATCH",  # GET: vnfPkgInfo
+                                     "<ID>": {"METHODS": ("GET", "DELETE", "PATCH"),  # GET: vnfPkgInfo

                                               "package_content": {"METHODS": ("GET", "PUT"),         # package
                                                                   "upload_from_uri": {"TODO": "POST"}
                                                                   },
                                               "package_content": {"METHODS": ("GET", "PUT"),         # package
                                                                   "upload_from_uri": {"TODO": "POST"}
                                                                   },