From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 30 Apr 2019 12:20:38 +0000 (+0000)
Subject: Install needed packages for Azure
X-Git-Tag: v6.0.0~10
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8dc9c8b71826f6939f453952bccdc0053712e7e0;p=osm%2FRO.git

Install needed packages for Azure

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

diff --git a/Dockerfile b/Dockerfile
index ebbd0acd..c5d85181 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,7 @@ RUN  apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
   DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \
   DEBIAN_FRONTEND=noninteractive pip install -U fog05rest && \
+  DEBIAN_FRONTEND=noninteractive pip install -U azure && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \
   DEBIAN_FRONTEND=noninteractive pip install untangle && \
diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index 1bd50a4e..5d1e02ab 100644
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -11,6 +11,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive pip2 install pip==9.0.3 && \
     DEBIAN_FRONTEND=noninteractive pip2 install -U progressbar pyvmomi pyvcloud==19.1.1 && \
     DEBIAN_FRONTEND=noninteractive pip2 install -U fog05rest && \
+    DEBIAN_FRONTEND=noninteractive pip2 install -U azure && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-requests && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install python-cffi libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py
index 44c6ea10..d229fa19 100644
--- a/osm_ro/vim_thread.py
+++ b/osm_ro/vim_thread.py
@@ -87,6 +87,7 @@ import vimconn_opennebula
 import vimconn_openstack
 import vimconn_vmware
 import vimconn_fos
+import vimconn_azure
 import yaml
 from db_base import db_base_Exception
 from lib_osm_openvim.ovim import ovimException
@@ -102,6 +103,7 @@ vim_module = {
     "openstack": vimconn_openstack,
     "vmware": vimconn_vmware,
     "fos": vimconn_fos
+    "azure": vimconn_azure,
 }
 
 
diff --git a/requirements.txt b/requirements.txt
index 79cb11f1..113f827e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,3 +21,4 @@ boto
 genisoimage
 untangle
 oca
+azure
diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index a34a0aa3..398317d3 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -280,6 +280,10 @@ then
     [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install \
         python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient \
         python-openstackclient python-networking-l2gw #TODO revise if gcc python-pip is needed
+
+    # required for Azure
+    pip2 install azure
+    
 fi  # [[ -z "$NO_PACKAGES" ]]
 
 if [[ -z $NOCLONE ]]; then
diff --git a/scripts/python-osm-ro.postinst b/scripts/python-osm-ro.postinst
index a2f632a3..32c89034 100755
--- a/scripts/python-osm-ro.postinst
+++ b/scripts/python-osm-ro.postinst
@@ -30,6 +30,7 @@ pip2 install --upgrade pyvmomi
 pip2 install --upgrade pyang pyangbind
 pip2 install untangle
 pip2 install -e git+https://github.com/python-oca/python-oca#egg=oca
+pip2 install azure
 
 # Packages required for fos connector
 pip2 install fog05rest