From 17587e31d62b42076f347a884b83ccd889edc5a8 Mon Sep 17 00:00:00 2001 From: lloretgalleg Date: Mon, 25 Nov 2019 14:31:18 +0100 Subject: [PATCH] Modified Docker-file include azure, corrected import azure plugin Change-Id: Iaaf8e99de2bb669a30baab4f41cb0d2ec8030950 Signed-off-by: lloretgalleg --- Dockerfile-local | 3 ++- RO-VIM-azure/osm_rovim_azure/vimconn_azure.py | 2 +- RO-VIM-fos/osm_rovim_fos/vimconn_fos.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile-local b/Dockerfile-local index 8430fa90..5ad7b4ba 100644 --- a/Dockerfile-local +++ b/Dockerfile-local @@ -19,7 +19,7 @@ LABEL authors="Alfonso Tierno" RUN apt-get update && apt-get install -y git python3 python3-pip \ && python3 -m pip install --upgrade pip \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install libmysqlclient-dev mysql-client \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev libmysqlclient-dev mysql-client \ && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U networking-l2gw \ && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U progressbar pyvmomi pyvcloud==19.1.1 \ && DEBIAN_FRONTEND=noninteractive apt-get -y install genisoimage @@ -52,6 +52,7 @@ RUN /root/RO/RO/osm_ro/scripts/install-osm-im.sh --develop && \ python3 -m pip install -e /root/RO/RO-VIM-openstack && \ python3 -m pip install -e /root/RO/RO-VIM-openvim && \ python3 -m pip install -e /root/RO/RO-VIM-aws && \ + python3 -m pip install -e /root/RO/RO-VIM-azure && \ python3 -m pip install -e /root/RO/RO-VIM-fos && \ python3 -m pip install -e /root/RO/RO-SDN-dynpac && \ python3 -m pip install -e /root/RO/RO-SDN-tapi && \ diff --git a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py index 7f2b2ea3..daf84631 100755 --- a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py +++ b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py @@ -14,7 +14,7 @@ ## import base64 -import vimconn +from osm_ro import vimconn import logging import netaddr import re diff --git a/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py b/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py index c30c1f15..b2795d81 100644 --- a/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py +++ b/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py @@ -37,7 +37,7 @@ __date__ ="$13-may-2019 10:35:12$" import uuid import socket import struct -from . import vimconn +from osm_ro import vimconn import random import yaml from functools import partial -- 2.25.1