Replacing Openstack Pike libraries by Queens

Change-Id: Ieb6d8219c7ce023a9d75242d70aeca43c89371af
Signed-off-by: Eduardo Sousa <eduardosousa@av.it.pt>

diff --git a/Dockerfile b/Dockerfile
index fccf66b..0a7a1d4 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN  apt-get update && \
   DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
   DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \

-  DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:pike && \
+  DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens && \

   DEBIAN_FRONTEND=noninteractive apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \
   DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \
   DEBIAN_FRONTEND=noninteractive apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \
   DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \

diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local
index 3847032..7d4c82b 100644 (file)
--- a/docker/Dockerfile-local
+++ b/docker/Dockerfile-local
@@ -8,7 +8,7 @@ COPY docker/scripts/ /bin/RO
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \

-    DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:pike && \
+    DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens && \

     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \

diff --git a/osm_ro/vimconn_openstack.py b/osm_ro/vimconn_openstack.py
index 0d2603f..53a5295 100644 (file)
--- a/osm_ro/vimconn_openstack.py
+++ b/osm_ro/vimconn_openstack.py
@@ -32,7 +32,7 @@ to the VIM connector's SFC resources as follows:
 - Service Function (OSM) -> Port Pair Group (Neutron)
 - Service Function Path (OSM) -> Port Chain (Neutron)
 '''
 - Service Function (OSM) -> Port Pair Group (Neutron)
 - Service Function Path (OSM) -> Port Chain (Neutron)
 '''

-__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes, xFlow Research, Igor D.C."
+__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes, xFlow Research, Igor D.C., Eduardo Sousa"

 __date__  = "$22-sep-2017 23:59:59$"
 
 import vimconn
 __date__  = "$22-sep-2017 23:59:59$"
 
 import vimconn


@@ -52,7 +52,6 @@ import keystoneclient.exceptions as ksExceptions
 import keystoneclient.v3.client as ksClient_v3
 import keystoneclient.v2_0.client as ksClient_v2
 from glanceclient import client as glClient
 import keystoneclient.v3.client as ksClient_v3
 import keystoneclient.v2_0.client as ksClient_v2
 from glanceclient import client as glClient

-import glanceclient.client as gl1Client

 import glanceclient.exc as gl1Exceptions
 from  cinderclient import client as cClient
 from httplib import HTTPException
 import glanceclient.exc as gl1Exceptions
 from  cinderclient import client as cClient
 from httplib import HTTPException


@@ -1620,7 +1619,7 @@ class vimconnector(vimconn.vimconnector):
         self.logger.debug("osconnector: Adding a new user to VIM")
         try:
             self._reload_connection()
         self.logger.debug("osconnector: Adding a new user to VIM")
         try:
             self._reload_connection()

-            user=self.keystone.users.create(user_name, user_passwd, tenant_id=tenant_id)
+            user=self.keystone.users.create(user_name, password=user_passwd, default_project=tenant_id)

             #self.keystone.tenants.add_user(self.k_creds["username"], #role)
             return user.id
         except ksExceptions.ConnectionError as e:
             #self.keystone.tenants.add_user(self.k_creds["username"], #role)
             return user.id
         except ksExceptions.ConnectionError as e:

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 7d1df99..3056efd 100755 (executable)
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -224,7 +224,7 @@ then
         "#####        UPDATE REPOSITORIES                            #####\n"\
         "#################################################################"
     [ "$_DISTRO" == "Ubuntu" ] && apt-get update -y &&
         "#####        UPDATE REPOSITORIES                            #####\n"\
         "#################################################################"
     [ "$_DISTRO" == "Ubuntu" ] && apt-get update -y &&

-        add-apt-repository -y cloud-archive:pike && apt-get update -y
+        add-apt-repository -y cloud-archive:queens && apt-get update -y

 
     [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && yum check-update -y
     [ "$_DISTRO" == "CentOS" ] && yum install -y epel-release
 
     [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && yum check-update -y
     [ "$_DISTRO" == "CentOS" ] && yum install -y epel-release