create base package 'osm_ro_plugin' for plugin
contains base packabe, dummy and failing connectors
All plugins will require this package instead of osm_ro
In that way plugin development is more independent
from main project, and it can be re-used in other projects.
For example openvim can use these SDN plugins without importing osm_ro
Change-Id: I9b598fdca269f04391e731cd07bb244f3918635d
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/Dockerfile-local b/Dockerfile-local
index d8c8432..97d804a 100644
--- a/Dockerfile-local
+++ b/Dockerfile-local
@@ -48,6 +48,7 @@
RUN /root/RO/RO/osm_ro/scripts/install-osm-im.sh --develop && \
mkdir -p /var/log/osm && \
+ python3 -m pip install -e /root/RO/RO-plugin && \
python3 -m pip install -e /root/RO/RO && \
python3 -m pip install -e /root/RO/RO-client && \
python3 -m pip install -e /root/RO/RO-VIM-vmware && \
diff --git a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py
index 37f4c58..ca8e58f 100644
--- a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py
+++ b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py
@@ -26,7 +26,7 @@
#
# This work has been performed in the context of Arista Telefonica OSM PoC.
##
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
import re
import socket
# Required by compare function
diff --git a/RO-SDN-arista_cloudvision/requirements.txt b/RO-SDN-arista_cloudvision/requirements.txt
index cd1edfe..a4ac97e 100644
--- a/RO-SDN-arista_cloudvision/requirements.txt
+++ b/RO-SDN-arista_cloudvision/requirements.txt
@@ -16,5 +16,4 @@
requests
uuid
cvprac
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-arista_cloudvision/setup.py b/RO-SDN-arista_cloudvision/setup.py
index ab8385b..33bd29f 100644
--- a/RO-SDN-arista_cloudvision/setup.py
+++ b/RO-SDN-arista_cloudvision/setup.py
@@ -36,18 +36,20 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='oscarluis.peral@atos.net', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='Oscar Luis Peral',
+ maintainer_email='oscarluis.peral@atos.net',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
packages=[_name],
include_package_data=True,
- install_requires=["requests",
- "uuid",
- "cvprac",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"],
+ install_requires=[
+ "requests",
+ "uuid",
+ "cvprac",
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
+ ],
setup_requires=['setuptools-version-command'],
entry_points={
'osm_rosdn.plugins': ['rosdn_arista_cloudvision = osm_rosdn_arista_cloudvision.'
diff --git a/RO-SDN-arista_cloudvision/stdeb.cfg b/RO-SDN-arista_cloudvision/stdeb.cfg
index 0c718e4..d1ff8c6 100644
--- a/RO-SDN-arista_cloudvision/stdeb.cfg
+++ b/RO-SDN-arista_cloudvision/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
+Depends3: python3-requests, python3-osm-ro-plugin, python3-pip
diff --git a/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py b/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
index 31072c3..27f739f 100755
--- a/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
+++ b/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
@@ -31,7 +31,7 @@
import requests
import struct
import sys
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
class DpbSshInterface():
diff --git a/RO-SDN-dpb/requirements.txt b/RO-SDN-dpb/requirements.txt
index 16035fc..354756f 100644
--- a/RO-SDN-dpb/requirements.txt
+++ b/RO-SDN-dpb/requirements.txt
@@ -15,5 +15,6 @@
paramiko
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
+
diff --git a/RO-SDN-dpb/setup.py b/RO-SDN-dpb/setup.py
index 6e1f9a7..2d869f9 100644
--- a/RO-SDN-dpb/setup.py
+++ b/RO-SDN-dpb/setup.py
@@ -36,16 +36,20 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
packages=[_name],
include_package_data=True,
dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
- install_requires=["paramiko", "requests", "osm-ro"],
+ install_requires=[
+ "paramiko",
+ "requests",
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin",
+ ],
setup_requires=['setuptools-version-command'],
entry_points={
'osm_rosdn.plugins': ['rosdn_dpb = osm_rosdn_dpb.wimconn_dpb:DpbConnector'],
diff --git a/RO-SDN-dpb/stdeb.cfg b/RO-SDN-dpb/stdeb.cfg
index 8c82164..c2228df 100644
--- a/RO-SDN-dpb/stdeb.cfg
+++ b/RO-SDN-dpb/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-paramiko, python3-requests, python3-osm-ro
+Depends3: python3-paramiko, python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py b/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py
index b32856b..c99627c 100644
--- a/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py
+++ b/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py
@@ -26,7 +26,7 @@
import logging
from enum import Enum
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
class SdnError(Enum):
diff --git a/RO-SDN-dynpac/requirements.txt b/RO-SDN-dynpac/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-dynpac/requirements.txt
+++ b/RO-SDN-dynpac/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-dynpac/setup.py b/RO-SDN-dynpac/setup.py
index af69a0d..a1c7c71 100644
--- a/RO-SDN-dynpac/setup.py
+++ b/RO-SDN-dynpac/setup.py
@@ -36,9 +36,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -46,7 +46,7 @@
include_package_data=True,
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-dynpac/stdeb.cfg b/RO-SDN-dynpac/stdeb.cfg
index 0c718e4..dea4d92 100644
--- a/RO-SDN-dynpac/stdeb.cfg
+++ b/RO-SDN-dynpac/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/floodlight_of.py b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/floodlight_of.py
index a274000..d4c7e3f 100644
--- a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/floodlight_of.py
+++ b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/floodlight_of.py
@@ -34,7 +34,7 @@
import json
import requests
import logging
-from osm_ro.wim.openflow_conn import OpenflowConn, OpenflowConnUnexpectedResponse, OpenflowConnConnectionException
+from osm_ro_plugin.openflow_conn import OpenflowConn, OpenflowConnUnexpectedResponse, OpenflowConnConnectionException
class OfConnFloodLight(OpenflowConn):
diff --git a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
index 6d90fe9..3303a4d 100644
--- a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
+++ b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
@@ -20,7 +20,7 @@
"""
import logging
-from osm_ro.wim.openflow_conn import SdnConnectorOpenFlow
+from osm_ro_plugin.openflow_conn import SdnConnectorOpenFlow
from .floodlight_of import OfConnFloodLight
diff --git a/RO-SDN-floodlight_openflow/requirements.txt b/RO-SDN-floodlight_openflow/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-floodlight_openflow/requirements.txt
+++ b/RO-SDN-floodlight_openflow/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-floodlight_openflow/setup.py b/RO-SDN-floodlight_openflow/setup.py
index d5b9848..faf1ce7 100644
--- a/RO-SDN-floodlight_openflow/setup.py
+++ b/RO-SDN-floodlight_openflow/setup.py
@@ -46,7 +46,7 @@
include_package_data=True,
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-floodlight_openflow/stdeb.cfg b/RO-SDN-floodlight_openflow/stdeb.cfg
index 0c718e4..f5f8e83 100644
--- a/RO-SDN-floodlight_openflow/stdeb.cfg
+++ b/RO-SDN-floodlight_openflow/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
-
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
index 26680b5..9b67fc1 100644
--- a/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
+++ b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
@@ -33,7 +33,7 @@
import requests
import uuid
import logging
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
"""CHeck layer where we move it"""
diff --git a/RO-SDN-ietfl2vpn/requirements.txt b/RO-SDN-ietfl2vpn/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-ietfl2vpn/requirements.txt
+++ b/RO-SDN-ietfl2vpn/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-ietfl2vpn/setup.py b/RO-SDN-ietfl2vpn/setup.py
index 9db91ef..70be60b 100644
--- a/RO-SDN-ietfl2vpn/setup.py
+++ b/RO-SDN-ietfl2vpn/setup.py
@@ -36,9 +36,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -47,7 +47,7 @@
dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-ietfl2vpn/stdeb.cfg b/RO-SDN-ietfl2vpn/stdeb.cfg
index 0c718e4..dea4d92 100644
--- a/RO-SDN-ietfl2vpn/stdeb.cfg
+++ b/RO-SDN-ietfl2vpn/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py
index c99452b..c8cca22 100644
--- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py
+++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py
@@ -17,7 +17,7 @@
import logging
import json
-from osm_ro.wim.sdnconn import SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorError
from osm_rosdn_juniper_contrail.rest_lib import ContrailHttp
from osm_rosdn_juniper_contrail.rest_lib import NotFound
# from osm_rosdn_juniper_contrail.rest_lib import DuplicateFound
diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py
index 0bbe734..43bfb87 100644
--- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py
+++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py
@@ -21,7 +21,7 @@
import yaml
import random
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
# from osm_rosdn_juniper_contrail.rest_lib import ContrailHttp
# from osm_rosdn_juniper_contrail.rest_lib import NotFound
from osm_rosdn_juniper_contrail.rest_lib import DuplicateFound
diff --git a/RO-SDN-juniper_contrail/requirements.txt b/RO-SDN-juniper_contrail/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-juniper_contrail/requirements.txt
+++ b/RO-SDN-juniper_contrail/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-juniper_contrail/setup.py b/RO-SDN-juniper_contrail/setup.py
index 40f04d1..fef5905 100644
--- a/RO-SDN-juniper_contrail/setup.py
+++ b/RO-SDN-juniper_contrail/setup.py
@@ -47,7 +47,7 @@
#dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-juniper_contrail/stdeb.cfg b/RO-SDN-juniper_contrail/stdeb.cfg
index 0c718e4..dea4d92 100644
--- a/RO-SDN-juniper_contrail/stdeb.cfg
+++ b/RO-SDN-juniper_contrail/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-odl_openflow/osm_rosdn_odlof/odl_of.py b/RO-SDN-odl_openflow/osm_rosdn_odlof/odl_of.py
index 1cfd0a4..329cb66 100644
--- a/RO-SDN-odl_openflow/osm_rosdn_odlof/odl_of.py
+++ b/RO-SDN-odl_openflow/osm_rosdn_odlof/odl_of.py
@@ -32,7 +32,7 @@
import requests
import base64
import logging
-from osm_ro.wim.openflow_conn import OpenflowConn, OpenflowConnException, OpenflowConnConnectionException, \
+from osm_ro_plugin.openflow_conn import OpenflowConn, OpenflowConnException, OpenflowConnConnectionException, \
OpenflowConnUnexpectedResponse, OpenflowConnAuthException, OpenflowConnNotFoundException, \
OpenflowConnConflictException, OpenflowConnNotSupportedException, OpenflowConnNotImplemented
diff --git a/RO-SDN-odl_openflow/osm_rosdn_odlof/sdnconn_odlof.py b/RO-SDN-odl_openflow/osm_rosdn_odlof/sdnconn_odlof.py
index 2850be4..190372a 100644
--- a/RO-SDN-odl_openflow/osm_rosdn_odlof/sdnconn_odlof.py
+++ b/RO-SDN-odl_openflow/osm_rosdn_odlof/sdnconn_odlof.py
@@ -20,7 +20,7 @@
"""
import logging
-from osm_ro.wim.openflow_conn import SdnConnectorOpenFlow
+from osm_ro_plugin.openflow_conn import SdnConnectorOpenFlow
from .odl_of import OfConnOdl
diff --git a/RO-SDN-odl_openflow/requirements.txt b/RO-SDN-odl_openflow/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-odl_openflow/requirements.txt
+++ b/RO-SDN-odl_openflow/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-odl_openflow/setup.py b/RO-SDN-odl_openflow/setup.py
index cdebc41..32ebde1 100644
--- a/RO-SDN-odl_openflow/setup.py
+++ b/RO-SDN-odl_openflow/setup.py
@@ -46,7 +46,7 @@
include_package_data=True,
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-odl_openflow/stdeb.cfg b/RO-SDN-odl_openflow/stdeb.cfg
index 0c718e4..f5f8e83 100644
--- a/RO-SDN-odl_openflow/stdeb.cfg
+++ b/RO-SDN-odl_openflow/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
-
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
index 139f7a0..fb09327 100644
--- a/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
+++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/onos_of.py
@@ -36,7 +36,7 @@
import requests
import base64
import logging
-from osm_ro.wim.openflow_conn import OpenflowConn, OpenflowConnException, OpenflowConnConnectionException, \
+from osm_ro_plugin.openflow_conn import OpenflowConn, OpenflowConnException, OpenflowConnConnectionException, \
OpenflowConnUnexpectedResponse, OpenflowConnAuthException, OpenflowConnNotFoundException, \
OpenflowConnConflictException, OpenflowConnNotSupportedException, OpenflowConnNotImplemented
diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
index e33994a..c5e081a 100644
--- a/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
+++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/sdnconn_onosof.py
@@ -20,7 +20,7 @@
"""
import logging
-from osm_ro.wim.openflow_conn import SdnConnectorOpenFlow
+from osm_ro_plugin.openflow_conn import SdnConnectorOpenFlow
from .onos_of import OfConnOnos
diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-onos_openflow/requirements.txt
+++ b/RO-SDN-onos_openflow/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py
index 96e6b62..66427b2 100644
--- a/RO-SDN-onos_openflow/setup.py
+++ b/RO-SDN-onos_openflow/setup.py
@@ -46,7 +46,7 @@
include_package_data=True,
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-onos_openflow/stdeb.cfg b/RO-SDN-onos_openflow/stdeb.cfg
index 0c718e4..f5f8e83 100644
--- a/RO-SDN-onos_openflow/stdeb.cfg
+++ b/RO-SDN-onos_openflow/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
-
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py
index eb14f55..200e4b0 100644
--- a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py
+++ b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py
@@ -27,7 +27,7 @@
import requests
from requests.auth import HTTPBasicAuth
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
class OnosVpls(SdnConnectorBase):
diff --git a/RO-SDN-onos_vpls/requirements.txt b/RO-SDN-onos_vpls/requirements.txt
index a6f6d65..3736678 100644
--- a/RO-SDN-onos_vpls/requirements.txt
+++ b/RO-SDN-onos_vpls/requirements.txt
@@ -14,5 +14,4 @@
##
requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
-
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py
index b015e67..562954b 100644
--- a/RO-SDN-onos_vpls/setup.py
+++ b/RO-SDN-onos_vpls/setup.py
@@ -36,9 +36,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@list.etsi.org',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@list.etsi.org',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -46,7 +46,7 @@
include_package_data=True,
install_requires=[
"requests",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
diff --git a/RO-SDN-onos_vpls/stdeb.cfg b/RO-SDN-onos_vpls/stdeb.cfg
index 0c718e4..dea4d92 100644
--- a/RO-SDN-onos_vpls/stdeb.cfg
+++ b/RO-SDN-onos_vpls/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-osm-ro
+Depends3: python3-requests, python3-osm-ro-plugin
diff --git a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
index 28dc4e9..fa24568 100644
--- a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
+++ b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
@@ -28,7 +28,7 @@
__author__ = "Saboor Ahmad"
__date__ = "10-Apr-2017"
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import yaml
import logging
import netaddr
@@ -39,7 +39,7 @@
import boto.vpc
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level=None,
config={}, persistent_info={}):
""" Params: uuid - id asigned to this VIM
@@ -59,7 +59,7 @@
empty dict. Useful to store login/tokens information for speed up communication
"""
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config, persistent_info)
self.persistent_info = persistent_info
@@ -67,15 +67,15 @@
if user:
self.a_creds['aws_access_key_id'] = user
else:
- raise vimconn.vimconnAuthException("Username is not specified")
+ raise vimconn.VimConnAuthException("Username is not specified")
if passwd:
self.a_creds['aws_secret_access_key'] = passwd
else:
- raise vimconn.vimconnAuthException("Password is not specified")
+ raise vimconn.VimConnAuthException("Password is not specified")
if 'region_name' in config:
self.region = config.get('region_name')
else:
- raise vimconn.vimconnException("AWS region_name is not specified at config")
+ raise vimconn.VimConnException("AWS region_name is not specified at config")
self.vpc_data = {}
self.subnet_data = {}
@@ -113,9 +113,9 @@
self.flavor_info = yaml.load(flavor_data, Loader=yaml.Loader)
except yaml.YAMLError as e:
self.flavor_info = None
- raise vimconn.vimconnException("Bad format at file '{}': {}".format(flavor_data[1:], e))
+ raise vimconn.VimConnException("Bad format at file '{}': {}".format(flavor_data[1:], e))
except IOError as e:
- raise vimconn.vimconnException("Error reading file '{}': {}".format(flavor_data[1:], e))
+ raise vimconn.VimConnException("Error reading file '{}': {}".format(flavor_data[1:], e))
elif isinstance(flavor_data, dict):
self.flavor_info = flavor_data
@@ -134,7 +134,7 @@
elif index == 'region':
self.region = value
else:
- vimconn.vimconnector.__setitem__(self, index, value)
+ vimconn.VimConnector.__setitem__(self, index, value)
def _reload_connection(self):
"""Returns: sets boto.EC2 and boto.VPC connection to work with AWS services
@@ -157,7 +157,7 @@
self.conn = None
self.conn_vpc = None
- raise vimconn.vimconnConnectionException(type(e).__name__ + ": " + str(e))
+ raise vimconn.VimConnConnectionException(type(e).__name__ + ": " + str(e))
def get_availability_zones_list(self):
"""Obtain AvailabilityZones from AWS
@@ -251,7 +251,7 @@
if availability_zones != 2 and availability_zones != 3:
self.logger.debug("Number of AZs should be 2 or 3")
- raise vimconn.vimconnNotSupportedException("Number of AZs should be 2 or 3")
+ raise vimconn.VimConnNotSupportedException("Number of AZs should be 2 or 3")
netmasks = ('255.255.252.0', '255.255.254.0', '255.255.255.0', '255.255.255.128')
ip = netaddr.IPNetwork(cidr)
@@ -259,7 +259,7 @@
if str(mask) not in netmasks:
self.logger.debug("Netmask " + str(mask) + " not found")
- raise vimconn.vimconnNotFoundException("Netmask " + str(mask) + " not found")
+ raise vimconn.VimConnNotFoundException("Netmask " + str(mask) + " not found")
if availability_zones == 2:
for n, netmask in enumerate(netmasks):
@@ -459,7 +459,7 @@
if flavor_id in self.flavor_info:
return self.flavor_info[flavor_id]
else:
- raise vimconn.vimconnNotFoundException("Cannot find flavor with this flavor ID/Name")
+ raise vimconn.VimConnNotFoundException("Cannot find flavor with this flavor ID/Name")
except Exception as e:
self.format_vimconn_exception(e)
@@ -492,7 +492,7 @@
flavor = (key, values)
if flavor:
return flavor[0]
- raise vimconn.vimconnNotFoundException("Cannot find flavor with this flavor ID/Name")
+ raise vimconn.VimConnNotFoundException("Cannot find flavor with this flavor ID/Name")
except Exception as e:
self.format_vimconn_exception(e)
diff --git a/RO-VIM-aws/requirements.txt b/RO-VIM-aws/requirements.txt
index 3cbc851..689089e 100644
--- a/RO-VIM-aws/requirements.txt
+++ b/RO-VIM-aws/requirements.txt
@@ -17,4 +17,4 @@
requests
netaddr
boto
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-aws/setup.py b/RO-VIM-aws/setup.py
index b8f3703..12de705 100644
--- a/RO-VIM-aws/setup.py
+++ b/RO-VIM-aws/setup.py
@@ -36,9 +36,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -46,10 +46,10 @@
include_package_data=True,
install_requires=[
"requests", "netaddr", "PyYAML", "boto",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_aws = osm_rovim_aws.vimconn_aws'],
+ 'osm_rovim.plugins': ['rovim_aws = osm_rovim_aws.vimconn_aws:vimconnector'],
},
)
diff --git a/RO-VIM-aws/stdeb.cfg b/RO-VIM-aws/stdeb.cfg
index 2193709..eece4e1 100644
--- a/RO-VIM-aws/stdeb.cfg
+++ b/RO-VIM-aws/stdeb.cfg
@@ -15,4 +15,4 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-boto, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro
+Depends3: python3-boto, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin
diff --git a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
index fc36638..dc40817 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
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import logging
import netaddr
import re
@@ -41,7 +41,7 @@
pdb.set_trace()
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
# Translate azure provisioning state to OSM provision state
# The first three ones are the transitional status once a user initiated action has been requested
@@ -85,7 +85,7 @@
"^Standard_B" will select a serie B maybe for test environment
"""
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config, persistent_info)
# Variable that indicates if client must be reloaded or initialized
@@ -112,19 +112,19 @@
self._config["subscription_id"] = config.get('subscription_id')
# self.logger.debug('Setting subscription to: %s', self.config["subscription_id"])
else:
- raise vimconn.vimconnException('Subscription not specified')
+ raise vimconn.VimConnException('Subscription not specified')
# REGION
if 'region_name' in config:
self.region = config.get('region_name')
else:
- raise vimconn.vimconnException('Azure region_name is not specified at config')
+ raise vimconn.VimConnException('Azure region_name is not specified at config')
# RESOURCE_GROUP
if 'resource_group' in config:
self.resource_group = config.get('resource_group')
else:
- raise vimconn.vimconnException('Azure resource_group is not specified at config')
+ raise vimconn.VimConnException('Azure resource_group is not specified at config')
# VNET_NAME
if 'vnet_name' in config:
@@ -168,7 +168,7 @@
resource = str(resource_id.split('/')[-1])
return resource
except Exception as e:
- raise vimconn.vimconnException("Unable to get resource name from resource_id '{}' Error: '{}'".
+ raise vimconn.VimConnException("Unable to get resource name from resource_id '{}' Error: '{}'".
format(resource_id, e))
def _get_location_from_resource_group(self, resource_group_name):
@@ -176,7 +176,7 @@
location = self.conn.resource_groups.get(resource_group_name).location
return location
except Exception as e:
- raise vimconn.vimconnNotFoundException("Location '{}' not found".format(resource_group_name))
+ raise vimconn.VimConnNotFoundException("Location '{}' not found".format(resource_group_name))
def _get_resource_group_name_from_resource_id(self, resource_id):
@@ -184,7 +184,7 @@
rg = str(resource_id.split('/')[4])
return rg
except Exception as e:
- raise vimconn.vimconnException("Unable to get resource group from invalid resource_id format '{}'".
+ raise vimconn.VimConnException("Unable to get resource group from invalid resource_id format '{}'".
format(resource_id))
def _get_net_name_from_resource_id(self, resource_id):
@@ -193,7 +193,7 @@
net_name = str(resource_id.split('/')[8])
return net_name
except Exception as e:
- raise vimconn.vimconnException("Unable to get azure net_name from invalid resource_id format '{}'".
+ raise vimconn.VimConnException("Unable to get azure net_name from invalid resource_id format '{}'".
format(resource_id))
def _check_subnets_for_vm(self, net_list):
@@ -208,16 +208,16 @@
"""
Transforms a generic or azure exception to a vimcommException
"""
- if isinstance(e, vimconn.vimconnException):
+ if isinstance(e, vimconn.VimConnException):
raise
elif isinstance(e, AuthenticationError):
- raise vimconn.vimconnAuthException(type(e).__name__ + ': ' + str(e))
+ raise vimconn.VimConnAuthException(type(e).__name__ + ': ' + str(e))
elif isinstance(e, ConnectionError):
- raise vimconn.vimconnConnectionException(type(e).__name__ + ': ' + str(e))
+ raise vimconn.VimConnConnectionException(type(e).__name__ + ': ' + str(e))
else:
# In case of generic error recreate client
self.reload_client = True
- raise vimconn.vimconnException(type(e).__name__ + ': ' + str(e))
+ raise vimconn.VimConnException(type(e).__name__ + ': ' + str(e))
def _check_or_create_resource_group(self):
"""
@@ -314,7 +314,7 @@
self.logger.debug('dinamically obtained ip_profile: %s', ip_range)
break
else:
- raise vimconn.vimconnException("Cannot find a non-used subnet range in {}".
+ raise vimconn.VimConnException("Cannot find a non-used subnet range in {}".
format(self.vnet_address_space))
else:
ip_profile = {"subnet_address": ip_profile['subnet_address']}
@@ -416,25 +416,25 @@
"""
It is not allowed to create new flavors in Azure, must always use an existing one
"""
- raise vimconn.vimconnAuthException("It is not possible to create new flavors in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to create new flavors in AZURE")
def new_tenant(self, tenant_name, tenant_description):
"""
It is not allowed to create new tenants in azure
"""
- raise vimconn.vimconnAuthException("It is not possible to create a TENANT in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to create a TENANT in AZURE")
def new_image(self, image_dict):
"""
It is not allowed to create new images in Azure, must always use an existing one
"""
- raise vimconn.vimconnAuthException("It is not possible to create new images in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to create new images in AZURE")
def get_image_id_from_path(self, path):
"""Get the image id from image path in the VIM database.
Returns the image_id or raises a vimconnNotFoundException
"""
- raise vimconn.vimconnAuthException("It is not possible to obtain image from path in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to obtain image from path in AZURE")
def get_image_list(self, filter_dict={}):
"""Obtain tenant images from VIM
@@ -472,10 +472,10 @@
else:
image_list = self._get_sku_image_list(publisher, offer, sku)
else:
- raise vimconn.vimconnAuthException(
+ raise vimconn.VimConnAuthException(
"List images in Azure must include name param with at least publisher")
else:
- raise vimconn.vimconnAuthException("List images in Azure must include name param with at"
+ raise vimconn.VimConnAuthException("List images in Azure must include name param with at"
" least publisher")
return image_list
@@ -608,7 +608,7 @@
# At least one network must be provided
if not net_list:
- raise vimconn.vimconnException("At least one net must be provided to create a new VM")
+ raise vimconn.VimConnException("At least one net must be provided to create a new VM")
# image_id are several fields of the image_id
image_reference = self._get_image_reference(image_id)
@@ -778,7 +778,7 @@
else:
return availability_zone_list[availability_zone_index]
else:
- raise vimconn.vimconnConflictException("No enough availability zones at VIM for this deployment")
+ raise vimconn.VimConnConflictException("No enough availability zones at VIM for this deployment")
def _get_azure_availability_zones(self):
return self.AZURE_ZONES
@@ -838,9 +838,9 @@
created_items[data_disk.id] = True
else:
- raise vimconn.vimconnNotFoundException("Invalid image_id: %s ", image_id)
+ raise vimconn.VimConnNotFoundException("Invalid image_id: %s ", image_id)
else:
- raise vimconn.vimconnNotFoundException("Invalid image_id: %s ", image_id)
+ raise vimconn.VimConnNotFoundException("Invalid image_id: %s ", image_id)
# Attach the disk created
virtual_machine.storage_profile.data_disks.append({
@@ -887,7 +887,7 @@
'version': version
}
except Exception as e:
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"Unable to get image_reference from invalid image_id format: '{}'".format(image_id))
# Azure VM names can not have some special characters
@@ -938,7 +938,7 @@
if listedFilteredSizes:
return listedFilteredSizes[0]['name']
- raise vimconn.vimconnNotFoundException("Cannot find any flavor matching '{}'".format(str(flavor_dict)))
+ raise vimconn.VimConnNotFoundException("Cannot find any flavor matching '{}'".format(str(flavor_dict)))
except Exception as e:
self._format_vimconn_exception(e)
@@ -967,7 +967,7 @@
self._reload_connection()
return True
except Exception as e:
- raise vimconn.vimconnException("Connectivity issue with Azure API: {}".format(e))
+ raise vimconn.VimConnException("Connectivity issue with Azure API: {}".format(e))
def get_network(self, net_id):
@@ -979,7 +979,7 @@
network_list = self.get_network_list(filter_dict)
if not network_list:
- raise vimconn.vimconnNotFoundException("network '{}' not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("network '{}' not found".format(net_id))
else:
return network_list[0]
@@ -992,7 +992,7 @@
filter_dict = {'name': res_name}
network_list = self.get_network_list(filter_dict)
if not network_list:
- raise vimconn.vimconnNotFoundException("network '{}' not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("network '{}' not found".format(net_id))
try:
# Subnet API fails (CloudError: Azure Error: ResourceNotFound)
@@ -1003,7 +1003,7 @@
except CloudError as e:
if e.error.error and "notfound" in e.error.error.lower():
- raise vimconn.vimconnNotFoundException("network '{}' not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("network '{}' not found".format(net_id))
else:
self._format_vimconn_exception(e)
except Exception as e:
@@ -1084,7 +1084,7 @@
except CloudError as e:
if e.error.error and "notfound" in e.error.error.lower():
- raise vimconn.vimconnNotFoundException("No vm instance found '{}'".format(vm_id))
+ raise vimconn.VimConnNotFoundException("No vm instance found '{}'".format(vm_id))
else:
self._format_vimconn_exception(e)
except Exception as e:
@@ -1171,20 +1171,20 @@
return None
except CloudError as e:
if e.error.error and "notfound" in e.error.error.lower():
- raise vimconn.vimconnNotFoundException("No vm found '{}'".format(vm_id))
+ raise vimconn.VimConnNotFoundException("No vm found '{}'".format(vm_id))
else:
self._format_vimconn_exception(e)
except Exception as e:
self._format_vimconn_exception(e)
def delete_flavor(self, flavor_id):
- raise vimconn.vimconnAuthException("It is not possible to delete a FLAVOR in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to delete a FLAVOR in AZURE")
def delete_tenant(self, tenant_id,):
- raise vimconn.vimconnAuthException("It is not possible to delete a TENANT in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to delete a TENANT in AZURE")
def delete_image(self, image_id):
- raise vimconn.vimconnAuthException("It is not possible to delete a IMAGE in AZURE")
+ raise vimconn.VimConnAuthException("It is not possible to delete a IMAGE in AZURE")
def get_vminstance(self, vm_id):
"""
@@ -1197,7 +1197,7 @@
vm = self.conn_compute.virtual_machines.get(self.resource_group, resName)
except CloudError as e:
if e.error.error and "notfound" in e.error.error.lower():
- raise vimconn.vimconnNotFoundException("No vminstance found '{}'".format(vm_id))
+ raise vimconn.VimConnNotFoundException("No vminstance found '{}'".format(vm_id))
else:
self._format_vimconn_exception(e)
except Exception as e:
@@ -1222,7 +1222,7 @@
}
return flavor
else:
- raise vimconn.vimconnNotFoundException("flavor '{}' not found".format(flavor_id))
+ raise vimconn.VimConnNotFoundException("flavor '{}' not found".format(flavor_id))
def get_tenant_list(self, filter_dict={}):
""" Obtains the list of tenants
@@ -1290,7 +1290,7 @@
"status": "VIM_ERROR",
"error_msg": str(e)
}
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("VimConnNotFoundException %s when searching subnet", e)
out_nets[net_id] = {
"status": "DELETED",
diff --git a/RO-VIM-azure/requirements.txt b/RO-VIM-azure/requirements.txt
index d025c96..88e2fca 100644
--- a/RO-VIM-azure/requirements.txt
+++ b/RO-VIM-azure/requirements.txt
@@ -17,4 +17,4 @@
requests
netaddr
azure==4.0.0
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-azure/setup.py b/RO-VIM-azure/setup.py
index 9548357..9debdd0 100644
--- a/RO-VIM-azure/setup.py
+++ b/RO-VIM-azure/setup.py
@@ -49,10 +49,10 @@
"netaddr",
"PyYAML",
"azure==4.0.0",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_azure = osm_rovim_azure.vimconn_azure'],
+ 'osm_rovim.plugins': ['rovim_azure = osm_rovim_azure.vimconn_azure:vimconnector'],
},
)
diff --git a/RO-VIM-azure/stdeb.cfg b/RO-VIM-azure/stdeb.cfg
index 968c55e..04cf304 100644
--- a/RO-VIM-azure/stdeb.cfg
+++ b/RO-VIM-azure/stdeb.cfg
@@ -15,5 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro, python3-pip
+Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip
diff --git a/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py b/RO-VIM-fos/osm_rovim_fos/vimconn_fos.py
index 903fa78..a7018f3 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 @@
import uuid
import socket
import struct
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import json
from functools import partial
from fog05 import FIMAPI
@@ -45,7 +45,7 @@
from fog05_sdk.interfaces.FDU import FDU
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level=None,
config={}, persistent_info={}):
"""Constructor of VIM
@@ -66,7 +66,7 @@
check against the VIM
"""
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config, persistent_info)
self.logger.debug('vimconn_fos init with config: {}'.format(config))
@@ -99,15 +99,15 @@
def check_vim_connectivity(self):
"""Checks VIM can be reached and user credentials are ok.
- Returns None if success or raised vimconnConnectionException, vimconnAuthException, ...
+ Returns None if success or raised VimConnConnectionException, VimConnAuthException, ...
"""
try:
self.fos_api.node.list()
return None
except fimapi.FIMAuthExcetpion as fae:
- raise vimconn.vimconnAuthException("Unable to authenticate to the VIM. Error {}".format(fae))
+ raise vimconn.VimConnAuthException("Unable to authenticate to the VIM. Error {}".format(fae))
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
def new_network(self, net_name, net_type, ip_profile=None, shared=False, provider_network_profile=None):
"""Adds a tenant network to VIM
@@ -130,7 +130,7 @@
"""
self.logger.debug('new_network: {}'.format(locals()))
if net_type in ['data','ptp']:
- raise vimconn.vimconnNotImplemented('{} type of network not supported'.format(net_type))
+ raise vimconn.VimConnNotImplemented('{} type of network not supported'.format(net_type))
net_uuid = '{}'.format(uuid.uuid4())
desc = {
@@ -153,15 +153,15 @@
ip.update({'gateway':ip_profile.get('gateway_address', None)})
desc.update({'ip_configuration':ip_info})
else:
- raise vimconn.vimconnNotImplemented('IPV6 network is not implemented at VIM')
+ raise vimconn.VimConnNotImplemented('IPV6 network is not implemented at VIM')
desc.update({'ip_configuration':ip})
self.logger.debug('VIM new_network args: {} - Generated Eclipse fog05 Descriptor {}'.format(locals(), desc))
try:
self.fos_api.network.add_network(desc)
except fimapi.FIMAResouceExistingException as free:
- raise vimconn.vimconnConflictException("Network already exists at VIM. Error {}".format(free))
+ raise vimconn.VimConnConflictException("Network already exists at VIM. Error {}".format(free))
except Exception as e:
- raise vimconn.vimconnException("Unable to create network {}. Error {}".format(net_name, e))
+ raise vimconn.VimConnException("Unable to create network {}. Error {}".format(net_name, e))
# No way from the current rest service to get the actual error, most likely it will be an already existing error
return net_uuid,{}
@@ -191,7 +191,7 @@
try:
nets = self.fos_api.network.list()
except Exception as e:
- raise vimconn.vimconnConnectionException("Cannot get network list from VIM, connection error. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("Cannot get network list from VIM, connection error. Error {}".format(e))
filters = [
partial(self.__name_filter, filter_name=filter_dict.get('name')),
@@ -229,7 +229,7 @@
self.logger.debug('get_network: {}'.format(net_id))
res = self.get_network_list(filter_dict={'id':net_id})
if len(res) == 0:
- raise vimconn.vimconnNotFoundException("Network {} not found at VIM".format(net_id))
+ raise vimconn.VimConnNotFoundException("Network {} not found at VIM".format(net_id))
return res[0]
def delete_network(self, net_id, created_items=None):
@@ -240,9 +240,9 @@
try:
self.fos_api.network.remove_network(net_id)
except fimapi.FIMNotFoundException as fnfe:
- raise vimconn.vimconnNotFoundException("Network {} not found at VIM (already deleted?). Error {}".format(net_id, fnfe))
+ raise vimconn.VimConnNotFoundException("Network {} not found at VIM (already deleted?). Error {}".format(net_id, fnfe))
except Exception as e:
- raise vimconn.vimconnException("Cannot delete network {} from VIM. Error {}".format(net_id, e))
+ raise vimconn.VimConnException("Cannot delete network {} from VIM. Error {}".format(net_id, e))
return net_id
def refresh_nets_status(self, net_list):
@@ -270,7 +270,7 @@
r.update({
osm_n.get('id'):{'status':osm_n.get('status')}
})
- except vimconn.vimconnNotFoundException:
+ except vimconn.VimConnNotFoundException:
r.update({
n:{'status':'VIM_ERROR'}
})
@@ -285,9 +285,9 @@
try:
r = self.fos_api.flavor.get(flavor_id)
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
if r is None:
- raise vimconn.vimconnNotFoundException("Flavor not found at VIM")
+ raise vimconn.VimConnNotFoundException("Flavor not found at VIM")
return {'id':r.get('uuid'), 'name':r.get('name'), 'fos':r}
def get_flavor_id_from_data(self, flavor_dict):
@@ -305,10 +305,10 @@
try:
flvs = self.fos_api.flavor.list()
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
r = [x.get('uuid') for x in flvs if (x.get('cpu_min_count') == flavor_dict.get('vcpus') and x.get('ram_size_mb') == flavor_dict.get('ram') and x.get('storage_size_gb') == flavor_dict.get('disk'))]
if len(r) == 0:
- raise vimconn.vimconnNotFoundException ( "No flavor found" )
+ raise vimconn.VimConnNotFoundException ( "No flavor found" )
return r[0]
def new_flavor(self, flavor_data):
@@ -344,9 +344,9 @@
try:
self.fos_api.flavor.add(desc)
except fimapi.FIMAResouceExistingException as free:
- raise vimconn.vimconnConflictException("Flavor {} already exist at VIM. Error {}".format(flv_id, free))
+ raise vimconn.VimConnConflictException("Flavor {} already exist at VIM. Error {}".format(flv_id, free))
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
return flv_id
def delete_flavor(self, flavor_id):
@@ -355,9 +355,9 @@
try:
self.fos_api.flavor.remove(flavor_id)
except fimapi.FIMNotFoundException as fnfe:
- raise vimconn.vimconnNotFoundException("Flavor {} not found at VIM (already deleted?). Error {}".format(flavor_id, fnfe))
+ raise vimconn.VimConnNotFoundException("Flavor {} not found at VIM (already deleted?). Error {}".format(flavor_id, fnfe))
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
return flavor_id
def new_image(self, image_dict):
@@ -380,9 +380,9 @@
try:
self.fos_api.image.add(desc)
except fimapi.FIMAResouceExistingException as free:
- raise vimconn.vimconnConflictException("Image {} already exist at VIM. Error {}".format(img_id, free))
+ raise vimconn.VimConnConflictException("Image {} already exist at VIM. Error {}".format(img_id, free))
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
return img_id
def get_image_id_from_path(self, path):
@@ -394,10 +394,10 @@
try:
imgs = self.fos_api.image.list()
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
res = [x.get('uuid') for x in imgs if x.get('uri')==path]
if len(res) == 0:
- raise vimconn.vimconnNotFoundException("Image with this path was not found")
+ raise vimconn.VimConnNotFoundException("Image with this path was not found")
return res[0]
def get_image_list(self, filter_dict={}):
@@ -416,7 +416,7 @@
try:
fimgs = self.fos_api.image.list()
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
filters = [
partial(self.__name_filter, filter_name=filter_dict.get('name')),
@@ -443,7 +443,7 @@
}
r.append(img_info)
return r
- #raise vimconnNotImplemented( "Should have implemented this" )
+ #raise VimConnNotImplemented( "Should have implemented this" )
def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None,
availability_zone_index=None, availability_zone_list=None):
@@ -507,9 +507,9 @@
img = self.fos_api.image.get(image_id)
if flv is None:
- raise vimconn.vimconnNotFoundException("Flavor {} not found at VIM".format(flavor_id))
+ raise vimconn.VimConnNotFoundException("Flavor {} not found at VIM".format(flavor_id))
if img is None:
- raise vimconn.vimconnNotFoundException("Image {} not found at VIM".format(image_id))
+ raise vimconn.VimConnNotFoundException("Image {} not found at VIM".format(image_id))
created_items = {
'fdu_id':'',
@@ -579,6 +579,7 @@
self.logger.debug('Eclipse fog05 FDU Descriptor: {}'.format(fdu_desc))
+
fdu = FDU(fdu_desc)
try:
@@ -613,9 +614,9 @@
self.logger.debug('new_vminstance returns: {} {}'.format( instance.uuid, created_items))
return str(instance.uuid), created_items
except fimapi.FIMAResouceExistingException as free:
- raise vimconn.vimconnConflictException("VM already exists at VIM. Error {}".format(free))
+ raise vimconn.VimConnConflictException("VM already exists at VIM. Error {}".format(free))
except Exception as e:
- raise vimconn.vimconnException("Error while instantiating VM {}. Error {}".format(name, e))
+ raise vimconn.VimConnException("Error while instantiating VM {}. Error {}".format(name, e))
def get_vminstance(self,vm_id):
"""Returns the VM instance information from VIM"""
@@ -624,9 +625,9 @@
try:
instance = self.fos_api.fdu.instance_info(vm_id)
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
if instance is None:
- raise vimconn.vimconnNotFoundException('VM with id {} not found!'.format(vm_id))
+ raise vimconn.VimConnNotFoundException('VM with id {} not found!'.format(vm_id))
return instance.to_json()
def delete_vminstance(self, vm_id, created_items=None):
@@ -663,10 +664,10 @@
self.fos_api.fdu.offload(fduid)
except Exception as e:
- raise vimconn.vimconnException("Error on deletting VM with id {}. Error {}".format(vm_id,e))
+ raise vimconn.VimConnException("Error on deletting VM with id {}. Error {}".format(vm_id,e))
return vm_id
- #raise vimconnNotImplemented( "Should have implemented this" )
+ #raise VimConnNotImplemented( "Should have implemented this" )
def refresh_vms_status(self, vm_list):
"""Get the status of the virtual machines and their interfaces/ports
@@ -803,7 +804,7 @@
self.logger.debug('VIM action_vminstance with args: {}'.format(locals()))
nid = self.fdu_node_map.get(vm_id)
if nid is None:
- raise vimconn.vimconnNotFoundException('No node for this VM')
+ raise vimconn.VimConnNotFoundException('No node for this VM')
try:
instance = self.fos_api.fdu.instance_info(vm_id)
if "start" in action_dict:
@@ -812,22 +813,22 @@
elif instance.get('status') == 'PAUSE':
self.fos_api.fdu.resume(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot start from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot start from current state: {}'.format(instance.get('status')))
elif "pause" in action_dict:
if instance.get('status') == 'RUN':
self.fos_api.fdu.pause(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot pause from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot pause from current state: {}'.format(instance.get('status')))
elif "resume" in action_dict:
if instance.get('status') == 'PAUSE':
self.fos_api.fdu.resume(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot resume from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot resume from current state: {}'.format(instance.get('status')))
elif "shutoff" in action_dict or "shutdown" or "forceOff" in action_dict:
if instance.get('status') == 'RUN':
self.fos_api.fdu.stop(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot shutoff from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot shutoff from current state: {}'.format(instance.get('status')))
elif "terminate" in action_dict:
if instance.get('status') == 'RUN':
self.fos_api.fdu.stop(vm_id)
@@ -845,14 +846,14 @@
self.fos_api.fdu.undefine(vm_id)
# self.fos_api.fdu.offload(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot terminate from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot terminate from current state: {}'.format(instance.get('status')))
elif "rebuild" in action_dict:
- raise vimconn.vimconnNotImplemented("Rebuild not implememnted")
+ raise vimconn.VimConnNotImplemented("Rebuild not implemented")
elif "reboot" in action_dict:
if instance.get('status') == 'RUN':
self.fos_api.fdu.stop(vm_id)
self.fos_api.fdu.start(vm_id)
else:
- raise vimconn.vimconnConflictException('Cannot reboot from current state: {}'.format(instance.get('status')))
+ raise vimconn.VimConnConflictException('Cannot reboot from current state: {}'.format(instance.get('status')))
except Exception as e:
- raise vimconn.vimconnConnectionException("VIM not reachable. Error {}".format(e))
+ raise vimconn.VimConnConnectionException("VIM not reachable. Error {}".format(e))
diff --git a/RO-VIM-fos/requirements.txt b/RO-VIM-fos/requirements.txt
index 7adec69..2bded1b 100644
--- a/RO-VIM-fos/requirements.txt
+++ b/RO-VIM-fos/requirements.txt
@@ -22,4 +22,4 @@
yaks==0.3.0.post1
pyangbind
sphinx
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-fos/setup.py b/RO-VIM-fos/setup.py
index a3beee9..9393566 100644
--- a/RO-VIM-fos/setup.py
+++ b/RO-VIM-fos/setup.py
@@ -36,9 +36,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -54,10 +54,10 @@
"fog05==0.2.0",
"pyangbind",
"sphinx",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_fos = osm_rovim_fos.vimconn_fos'],
+ 'osm_rovim.plugins': ['rovim_fos = osm_rovim_fos.vimconn_fos:vimconnector'],
},
)
diff --git a/RO-VIM-fos/stdeb.cfg b/RO-VIM-fos/stdeb.cfg
index cf4b353..bea34ad 100644
--- a/RO-VIM-fos/stdeb.cfg
+++ b/RO-VIM-fos/stdeb.cfg
@@ -15,4 +15,4 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-pip, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro
+Depends3: python3-pip, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin
diff --git a/RO-VIM-opennebula/osm_rovim_opennebula/vimconn_opennebula.py b/RO-VIM-opennebula/osm_rovim_opennebula/vimconn_opennebula.py
index d788dcb..00c9b02 100644
--- a/RO-VIM-opennebula/osm_rovim_opennebula/vimconn_opennebula.py
+++ b/RO-VIM-opennebula/osm_rovim_opennebula/vimconn_opennebula.py
@@ -28,7 +28,7 @@
__author__ = "Jose Maria Carmona Perez,Juan Antonio Hernando Labajo, Emilio Abraham Garrido Garcia,Alberto Florez " \
"Pages, Andres Pozo Munoz, Santiago Perez Marin, Onlife Networks Telefonica I+D Product Innovation "
__date__ = "$13-dec-2017 11:09:29$"
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import requests
import logging
import oca
@@ -37,7 +37,7 @@
import random
import pyone
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None,
log_level="DEBUG", config={}, persistent_info={}):
@@ -59,7 +59,7 @@
check against the VIM
"""
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config)
def _new_one_connection(self):
@@ -95,7 +95,7 @@
return str(group.id)
except Exception as e:
self.logger.error("Create new tenant error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def delete_tenant(self, tenant_id):
"""Delete a tenant from VIM. Returns the old tenant identifier"""
@@ -112,10 +112,10 @@
self._delete_secondarygroup(user.id, group.id)
group.delete(client)
return None
- raise vimconn.vimconnNotFoundException("Group {} not found".format(tenant_id))
+ raise vimconn.VimConnNotFoundException("Group {} not found".format(tenant_id))
except Exception as e:
self.logger.error("Delete tenant " + str(tenant_id) + " error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def _add_secondarygroup(self, id_user, id_group):
# change secondary_group to primary_group
@@ -229,7 +229,7 @@
return net_id, created_items
except Exception as e:
self.logger.error("Create new network error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def get_network_list(self, filter_dict={}):
"""Obtain tenant networks of VIM
@@ -272,7 +272,7 @@
return response
except Exception as e:
self.logger.error("Get network list error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def get_network(self, net_id):
"""Obtain network details from the 'net_id' VIM network
@@ -297,10 +297,10 @@
if net:
return net
else:
- raise vimconn.vimconnNotFoundException("Network {} not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("Network {} not found".format(net_id))
except Exception as e:
self.logger.error("Get network " + str(net_id) + " error): " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def delete_network(self, net_id, created_items=None):
"""
@@ -316,7 +316,7 @@
return net_id
except Exception as e:
self.logger.error("Delete network " + str(net_id) + "error: network not found" + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def refresh_nets_status(self, net_list):
"""Get the status of the networks
@@ -343,17 +343,17 @@
net_vim = self.get_network(net_id)
net["status"] = net_vim["status"]
net["vim_info"] = None
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting net status: {}".format(str(e)))
net['status'] = "DELETED"
net['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error(e)
net["status"] = "VIM_ERROR"
net["error_msg"] = str(e)
net_dict[net_id] = net
return net_dict
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error(e)
for k in net_dict:
net_dict[k]["status"] = "VIM_ERROR"
@@ -371,10 +371,10 @@
template = one.template.info(int(flavor_id))
if template is not None:
return {'id': template.ID, 'name': template.NAME}
- raise vimconn.vimconnNotFoundException("Flavor {} not found".format(flavor_id))
+ raise vimconn.VimConnNotFoundException("Flavor {} not found".format(flavor_id))
except Exception as e:
self.logger.error("get flavor " + str(flavor_id) + " error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def new_flavor(self, flavor_data):
"""Adds a tenant flavor to VIM
@@ -424,7 +424,7 @@
except Exception as e:
self.logger.error("Create new flavor error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def delete_flavor(self, flavor_id):
""" Deletes a tenant flavor from VIM
@@ -436,7 +436,7 @@
return flavor_id
except Exception as e:
self.logger.error("Error deleting flavor " + str(flavor_id) + ". Flavor not found")
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def get_image_list(self, filter_dict={}):
"""Obtain tenant images from VIM
@@ -468,7 +468,7 @@
return images
except Exception as e:
self.logger.error("Get image list error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None,
availability_zone_index=None, availability_zone_list=None):
@@ -560,10 +560,10 @@
return str(vm_instance_id), None
except pyone.OneNoExistsException as e:
self.logger.error("Network with id " + str(e) + " not found: " + str(e))
- raise vimconn.vimconnNotFoundException(e)
+ raise vimconn.VimConnNotFoundException(e)
except Exception as e:
self.logger.error("Create new vm instance error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def get_vminstance(self, vm_id):
"""Returns the VM instance information from VIM"""
@@ -573,7 +573,7 @@
return vm
except Exception as e:
self.logger.error("Getting vm instance error: " + str(e) + ": VM Instance not found")
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def delete_vminstance(self, vm_id, created_items=None):
"""
@@ -595,10 +595,10 @@
except pyone.OneNoExistsException as e:
self.logger.info("The vm " + str(vm_id) + " does not exist or is already deleted")
- raise vimconn.vimconnNotFoundException("The vm {} does not exist or is already deleted".format(vm_id))
+ raise vimconn.VimConnNotFoundException("The vm {} does not exist or is already deleted".format(vm_id))
except Exception as e:
self.logger.error("Delete vm instance " + str(vm_id) + " error: " + str(e))
- raise vimconn.vimconnException(e)
+ raise vimconn.VimConnException(e)
def refresh_vms_status(self, vm_list):
"""Get the status of the virtual machines and their interfaces/ports
diff --git a/RO-VIM-opennebula/requirements.txt b/RO-VIM-opennebula/requirements.txt
index 71b09d8..d3420cf 100644
--- a/RO-VIM-opennebula/requirements.txt
+++ b/RO-VIM-opennebula/requirements.txt
@@ -20,4 +20,4 @@
untangle
pyone
git+https://github.com/python-oca/python-oca#egg=oca
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-opennebula/setup.py b/RO-VIM-opennebula/setup.py
index 7819282..4b3ec17 100644
--- a/RO-VIM-opennebula/setup.py
+++ b/RO-VIM-opennebula/setup.py
@@ -37,9 +37,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -49,10 +49,10 @@
"requests",
"netaddr",
"PyYAML",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_opennebula = osm_rovim_opennebula.vimconn_opennebula'],
+ 'osm_rovim.plugins': ['rovim_opennebula = osm_rovim_opennebula.vimconn_opennebula:vimconnector'],
},
)
diff --git a/RO-VIM-opennebula/stdeb.cfg b/RO-VIM-opennebula/stdeb.cfg
index 00071bd..5392c30 100644
--- a/RO-VIM-opennebula/stdeb.cfg
+++ b/RO-VIM-opennebula/stdeb.cfg
@@ -16,5 +16,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro, python3-pip
+Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip
diff --git a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
index 5eb23f0..6bfc125 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
@@ -30,8 +30,8 @@
import mock
from neutronclient.v2_0.client import Client
-from osm_ro import vimconn
-from osm_ro.vimconn_openstack import vimconnector
+from osm_ro_plugin import vimconn
+from osm_rovim_openstack.vimconn_openstack import vimconnector
__author__ = "Igor D.C."
@@ -238,7 +238,7 @@
@mock.patch.object(Client, 'create_sfc_flow_classifier')
def test_new_classification_unsupported_type(self, create_sfc_flow_classifier):
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_classification,
create_sfc_flow_classifier, 'h265')
@@ -258,11 +258,11 @@
def test_new_sfi_bad_ingress_ports(self, create_sfc_port_pair):
ingress_ports = ['5311c75d-d718-4369-bbda-cdcc6da60fcc',
'a0273f64-82c9-11e7-b08f-6328e53f0fa7']
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_sfi,
create_sfc_port_pair, True, ingress_ports=ingress_ports)
ingress_ports = []
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_sfi,
create_sfc_port_pair, True, ingress_ports=ingress_ports)
@@ -270,11 +270,11 @@
def test_new_sfi_bad_egress_ports(self, create_sfc_port_pair):
egress_ports = ['230cdf1b-de37-4891-bc07-f9010cf1f967',
'b41228fe-82c9-11e7-9b44-17504174320b']
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_sfi,
create_sfc_port_pair, True, egress_ports=egress_ports)
egress_ports = []
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_sfi,
create_sfc_port_pair, True, egress_ports=egress_ports)
@@ -289,7 +289,7 @@
def test_new_sf_inconsistent_sfc_encap(self, create_sfc_port_pair_group,
get_sfi):
get_sfi.return_value = {'sfc_encap': 'nsh'}
- self.assertRaises(vimconn.vimconnNotSupportedException,
+ self.assertRaises(vimconn.VimConnNotSupportedException,
self._test_new_sf, create_sfc_port_pair_group)
@mock.patch.object(Client, 'create_sfc_port_chain')
@@ -566,7 +566,7 @@
]}
# call the VIM connector
- self.assertRaises(vimconn.vimconnConflictException,
+ self.assertRaises(vimconn.VimConnConflictException,
self.vimconn.get_classification,
'3196bafc-82dd-11e7-a205-9bf6c14b0721')
@@ -580,7 +580,7 @@
list_sfc_flow_classifiers.return_value = {'flow_classifiers': []}
# call the VIM connector
- self.assertRaises(vimconn.vimconnNotFoundException,
+ self.assertRaises(vimconn.VimConnNotFoundException,
self.vimconn.get_classification,
'3196bafc-82dd-11e7-a205-9bf6c14b0721')
@@ -644,7 +644,7 @@
]}
# call the VIM connector
- self.assertRaises(vimconn.vimconnConflictException,
+ self.assertRaises(vimconn.VimConnConflictException,
self.vimconn.get_sfi,
'c0436d92-82db-11e7-8f9c-5fa535f1261f')
@@ -658,7 +658,7 @@
list_sfc_port_pairs.return_value = {'port_pairs': []}
# call the VIM connector
- self.assertRaises(vimconn.vimconnNotFoundException,
+ self.assertRaises(vimconn.VimConnNotFoundException,
self.vimconn.get_sfi,
'b22892fc-82d9-11e7-ae85-0fea6a3b3757')
@@ -715,7 +715,7 @@
]}
# call the VIM connector
- self.assertRaises(vimconn.vimconnConflictException,
+ self.assertRaises(vimconn.VimConnConflictException,
self.vimconn.get_sf,
'b22892fc-82d9-11e7-ae85-0fea6a3b3757')
@@ -729,7 +729,7 @@
list_sfc_port_pair_groups.return_value = {'port_pair_groups': []}
# call the VIM connector
- self.assertRaises(vimconn.vimconnNotFoundException,
+ self.assertRaises(vimconn.VimConnNotFoundException,
self.vimconn.get_sf,
'b22892fc-82d9-11e7-ae85-0fea6a3b3757')
@@ -796,7 +796,7 @@
]}
# call the VIM connector
- self.assertRaises(vimconn.vimconnConflictException,
+ self.assertRaises(vimconn.VimConnConflictException,
self.vimconn.get_sfp,
'5d002f38-82de-11e7-a770-f303f11ce66a')
@@ -810,7 +810,7 @@
list_sfc_port_chains.return_value = {'port_chains': []}
# call the VIM connector
- self.assertRaises(vimconn.vimconnNotFoundException,
+ self.assertRaises(vimconn.VimConnNotFoundException,
self.vimconn.get_sfp,
'5d002f38-82de-11e7-a770-f303f11ce66a')
diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index e392ca7..6123141 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@ -32,7 +32,7 @@
__author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes, xFlow Research, Igor D.C., Eduardo Sousa"
__date__ = "$22-sep-2017 23:59:59$"
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
# import json
import logging
import netaddr
@@ -87,7 +87,7 @@
return super(SafeDumper, self).represent_data(data)
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None,
log_level=None, config={}, persistent_info={}):
'''using common constructor parameters. In this case
@@ -96,11 +96,11 @@
'''
api_version = config.get('APIversion')
if api_version and api_version not in ('v3.3', 'v2.0', '2', '3'):
- raise vimconn.vimconnException("Invalid value '{}' for config:APIversion. "
+ raise vimconn.VimConnException("Invalid value '{}' for config:APIversion. "
"Allowed values are 'v3.3', 'v2.0', '2' or '3'".format(api_version))
vim_type = config.get('vim_type')
if vim_type and vim_type not in ('vio', 'VIO'):
- raise vimconn.vimconnException("Invalid value '{}' for config:vim_type."
+ raise vimconn.VimConnException("Invalid value '{}' for config:vim_type."
"Allowed values are 'vio' or 'VIO'".format(vim_type))
if config.get('dataplane_net_vlan_range') is not None:
@@ -111,11 +111,11 @@
#validate vlan ranges provided by user
self._validate_vlan_ranges(config.get('multisegment_vlan_range'), 'multisegment_vlan_range')
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config)
if self.config.get("insecure") and self.config.get("ca_cert"):
- raise vimconn.vimconnException("options insecure and ca_cert are mutually exclusive")
+ raise vimconn.VimConnException("options insecure and ca_cert are mutually exclusive")
self.verify = True
if self.config.get("insecure"):
self.verify = False
@@ -168,7 +168,7 @@
elif index == 'user_domain_id':
return self.config.get("user_domain_id")
else:
- return vimconn.vimconnector.__getitem__(self, index)
+ return vimconn.VimConnector.__getitem__(self, index)
def __setitem__(self, index, value):
"""Set individuals parameters and it is marked as dirty so to force connection reload.
@@ -178,7 +178,7 @@
elif index == 'user_domain_id':
self.config["user_domain_id"] = value
else:
- vimconn.vimconnector.__setitem__(self, index, value)
+ vimconn.VimConnector.__setitem__(self, index, value)
self.session['reload_client'] = True
def serialize(self, value):
@@ -401,22 +401,22 @@
if isinstance(exception, (neExceptions.NetworkNotFoundClient, nvExceptions.NotFound, ksExceptions.NotFound,
gl1Exceptions.HTTPNotFound)):
- raise vimconn.vimconnNotFoundException(type(exception).__name__ + ": " + message_error)
+ raise vimconn.VimConnNotFoundException(type(exception).__name__ + ": " + message_error)
elif isinstance(exception, (HTTPException, gl1Exceptions.HTTPException, gl1Exceptions.CommunicationError,
ConnectionError, ksExceptions.ConnectionError, neExceptions.ConnectionFailed)):
- raise vimconn.vimconnConnectionException(type(exception).__name__ + ": " + message_error)
+ raise vimconn.VimConnConnectionException(type(exception).__name__ + ": " + message_error)
elif isinstance(exception, (KeyError, nvExceptions.BadRequest, ksExceptions.BadRequest)):
- raise vimconn.vimconnException(type(exception).__name__ + ": " + message_error)
+ raise vimconn.VimConnException(type(exception).__name__ + ": " + message_error)
elif isinstance(exception, (nvExceptions.ClientException, ksExceptions.ClientException,
neExceptions.NeutronException)):
- raise vimconn.vimconnUnexpectedResponse(type(exception).__name__ + ": " + message_error)
+ raise vimconn.VimConnUnexpectedResponse(type(exception).__name__ + ": " + message_error)
elif isinstance(exception, nvExceptions.Conflict):
- raise vimconn.vimconnConflictException(type(exception).__name__ + ": " + message_error)
- elif isinstance(exception, vimconn.vimconnException):
+ raise vimconn.VimConnConflictException(type(exception).__name__ + ": " + message_error)
+ elif isinstance(exception, vimconn.VimConnException):
raise exception
else: # ()
self.logger.error("General Exception " + message_error, exc_info=True)
- raise vimconn.vimconnConnectionException(type(exception).__name__ + ": " + message_error)
+ raise vimconn.VimConnConnectionException(type(exception).__name__ + ": " + message_error)
def _get_ids_from_name(self):
"""
@@ -426,7 +426,7 @@
# get tenant_id if only tenant_name is supplied
self._reload_connection()
if not self.my_tenant_id:
- raise vimconn.vimconnConnectionException("Error getting tenant information from name={} id={}".
+ raise vimconn.VimConnConnectionException("Error getting tenant information from name={} id={}".
format(self.tenant_name, self.tenant_id))
if self.config.get('security_groups') and not self.security_groups_id:
# convert from name to id
@@ -440,7 +440,7 @@
break
else:
self.security_groups_id = None
- raise vimconn.vimconnConnectionException("Not found security group {} for this tenant".format(sg))
+ raise vimconn.VimConnConnectionException("Not found security group {} for this tenant".format(sg))
def check_vim_connectivity(self):
# just get network list to check connectivity and credentials
@@ -541,7 +541,7 @@
# or not declared, just ignore the checking
if isinstance(self.config.get('dataplane_physical_net'), (tuple, list)) and \
provider_physical_network not in self.config['dataplane_physical_net']:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
"Invalid parameter 'provider-network:physical-network' for network creation. '{}' is not "
"one of the declared list at VIM_config:dataplane_physical_net".format(
provider_physical_network))
@@ -552,7 +552,7 @@
provider_physical_network = provider_physical_network[0]
if not provider_physical_network:
- raise vimconn.vimconnConflictException("You must provide a 'dataplane_physical_net' at VIM_config "
+ raise vimconn.VimConnConflictException("You must provide a 'dataplane_physical_net' at VIM_config "
"for creating underlay networks. or use the NS instantiation"
" parameter provider-network:physical-network for the VLD")
@@ -582,7 +582,7 @@
vlanID = self._generate_multisegment_vlanID()
segment2_dict["provider:segmentation_id"] = vlanID
# else
- # raise vimconn.vimconnConflictException(
+ # raise vimconn.VimConnConflictException(
# "You must provide 'multisegment_vlan_range' at config dict before creating a multisegment network")
segment_list.append(segment2_dict)
network_dict["segments"] = segment_list
@@ -590,7 +590,7 @@
# VIO Specific Changes. It needs a concrete VLAN
if self.vim_type == "VIO" and vlan is None:
if self.config.get('dataplane_net_vlan_range') is None:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
"You must provide 'dataplane_net_vlan_range' in format [start_ID - end_ID] at VIM_config "
"for creating underlay networks")
network_dict["provider:segmentation_id"] = self._generate_vlanID()
@@ -695,9 +695,9 @@
filter_dict={"id": net_id}
net_list = self.get_network_list(filter_dict)
if len(net_list)==0:
- raise vimconn.vimconnNotFoundException("Network '{}' not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("Network '{}' not found".format(net_id))
elif len(net_list)>1:
- raise vimconn.vimconnConflictException("Found more than one network with this criteria")
+ raise vimconn.VimConnConflictException("Found more than one network with this criteria")
net = net_list[0]
subnets=[]
for subnet_id in net.get("subnets", () ):
@@ -784,11 +784,11 @@
if net_vim.get('fault'): #TODO
net['error_msg'] = str(net_vim['fault'])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting net status: %s", str(e))
net['status'] = "DELETED"
net['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting net status: %s", str(e))
net['status'] = "VIM_ERROR"
net['error_msg'] = str(e)
@@ -824,9 +824,9 @@
extended = flavor_dict.get("extended", {})
if extended:
#TODO
- raise vimconn.vimconnNotFoundException("Flavor with EPA still not implemented")
+ raise vimconn.VimConnNotFoundException("Flavor with EPA still not implemented")
# if len(numas) > 1:
- # raise vimconn.vimconnNotFoundException("Cannot find any flavor with more than one numa")
+ # raise vimconn.VimConnNotFoundException("Cannot find any flavor with more than one numa")
# numa=numas[0]
# numas = extended.get("numas")
for flavor in self.nova.flavors.list():
@@ -842,7 +842,7 @@
flavor_candidate_data = flavor_data
if not exact_match and flavor_candidate_id:
return flavor_candidate_id
- raise vimconn.vimconnNotFoundException("Cannot find any flavor matching '{}'".format(str(flavor_dict)))
+ raise vimconn.VimConnNotFoundException("Cannot find any flavor matching '{}'".format(str(flavor_dict)))
except (nvExceptions.NotFound, nvExceptions.ClientException, ksExceptions.ClientException, ConnectionError) as e:
self._format_exception(e)
@@ -927,7 +927,7 @@
extra_specs["hw:cpu_policy"] = "dedicated"
# for interface in numa.get("interfaces",() ):
# if interface["dedicated"]=="yes":
- # raise vimconn.vimconnException("Passthrough interfaces are not supported for the openstack connector", http_code=vimconn.HTTP_Service_Unavailable)
+ # raise vimconn.VimConnException("Passthrough interfaces are not supported for the openstack connector", http_code=vimconn.HTTP_Service_Unavailable)
# #TODO, add the key 'pci_passthrough:alias"="<label at config>:<number ifaces>"' when a way to connect it is available
elif extended.get("cpu-quota"):
self.process_resource_quota(extended.get("cpu-quota"), "cpu", extra_specs)
@@ -1016,7 +1016,7 @@
new_image = self.glance.images.create(name=image_dict['name'])
if image_dict['location'].startswith("http"):
# TODO there is not a method to direct download. It must be downloaded locally with requests
- raise vimconn.vimconnNotImplemented("Cannot create image from URL")
+ raise vimconn.VimConnNotImplemented("Cannot create image from URL")
else: #local path
with open(image_dict['location']) as fimage:
self.glance.images.upload(new_image.id, fimage)
@@ -1037,7 +1037,7 @@
continue
self._format_exception(e)
except IOError as e: #can not open the file
- raise vimconn.vimconnConnectionException(type(e).__name__ + ": " + str(e)+ " for " + image_dict['location'],
+ raise vimconn.VimConnConnectionException(type(e).__name__ + ": " + str(e)+ " for " + image_dict['location'],
http_code=vimconn.HTTP_Bad_Request)
def delete_image(self, image_id):
@@ -1058,7 +1058,7 @@
for image in images:
if image.metadata.get("location")==path:
return image.id
- raise vimconn.vimconnNotFoundException("image with location '{}' not found".format( path))
+ raise vimconn.VimConnNotFoundException("image with location '{}' not found".format( path))
except (ksExceptions.ClientException, nvExceptions.ClientException, gl1Exceptions.CommunicationError, ConnectionError) as e:
self._format_exception(e)
@@ -1111,7 +1111,7 @@
# if we exceeded the timeout rollback
if elapsed_time >= server_timeout:
- raise vimconn.vimconnException('Timeout waiting for instance ' + vm_id + ' to get ' + status,
+ raise vimconn.VimConnException('Timeout waiting for instance ' + vm_id + ' to get ' + status,
http_code=vimconn.HTTP_Request_Timeout)
def _get_openstack_availablity_zones(self):
@@ -1170,7 +1170,7 @@
else:
return availability_zone_list[availability_zone_index]
else:
- raise vimconn.vimconnConflictException("No enough availability zones at VIM for this deployment")
+ raise vimconn.VimConnConflictException("No enough availability zones at VIM for this deployment")
def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None,
availability_zone_index=None, availability_zone_list=None):
@@ -1347,7 +1347,7 @@
elapsed_time += 5
# If we exceeded the timeout rollback
if elapsed_time >= volume_timeout:
- raise vimconn.vimconnException('Timeout creating volumes for instance ' + name,
+ raise vimconn.VimConnException('Timeout creating volumes for instance ' + name,
http_code=vimconn.HTTP_Request_Timeout)
# get availability Zone
vm_av_zone = self._get_vm_availability_zone(availability_zone_index, availability_zone_list)
@@ -1378,7 +1378,7 @@
self.neutron.update_port(port_id,
{"port": {"port_security_enabled": False, "security_groups": None}})
except Exception as e:
- raise vimconn.vimconnException("It was not possible to disable port security for port {}".format(
+ raise vimconn.VimConnException("It was not possible to disable port security for port {}".format(
port_id))
# print "DONE :-)", server
@@ -1409,11 +1409,11 @@
external_nets.append(net)
if len(external_nets) == 0:
- raise vimconn.vimconnException("Cannot create floating_ip automatically since no external "
+ raise vimconn.VimConnException("Cannot create floating_ip automatically since no external "
"network is present",
http_code=vimconn.HTTP_Conflict)
if len(external_nets) > 1:
- raise vimconn.vimconnException("Cannot create floating_ip automatically since multiple "
+ raise vimconn.VimConnException("Cannot create floating_ip automatically since multiple "
"external networks are present",
http_code=vimconn.HTTP_Conflict)
@@ -1424,7 +1424,7 @@
new_floating_ip = self.neutron.create_floatingip(param)
free_floating_ip = new_floating_ip['floatingip']['id']
except Exception as e:
- raise vimconn.vimconnException(type(e).__name__ + ": Cannot create new floating_ip " +
+ raise vimconn.VimConnException(type(e).__name__ + ": Cannot create new floating_ip " +
str(e), http_code=vimconn.HTTP_Conflict)
while not assigned:
@@ -1441,7 +1441,7 @@
if time.time() - vm_start_time < server_timeout:
time.sleep(5)
continue
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"Cannot create floating_ip: {} {}".format(type(e).__name__, e),
http_code=vimconn.HTTP_Conflict)
@@ -1456,7 +1456,7 @@
# error_value=-vimconn.HTTP_Not_Found
# error_text= "vm instance %s not found" % vm_id
# except TypeError as e:
-# raise vimconn.vimconnException(type(e).__name__ + ": "+ str(e), http_code=vimconn.HTTP_Bad_Request)
+# raise vimconn.VimConnException(type(e).__name__ + ": "+ str(e), http_code=vimconn.HTTP_Bad_Request)
except Exception as e:
server_id = None
@@ -1507,7 +1507,7 @@
elif console_type == "spice-html5":
console_dict = server.get_spice_console(console_type)
else:
- raise vimconn.vimconnException("console type '{}' not allowed".format(console_type), http_code=vimconn.HTTP_Bad_Request)
+ raise vimconn.VimConnException("console type '{}' not allowed".format(console_type), http_code=vimconn.HTTP_Bad_Request)
console_dict1 = console_dict.get("console")
if console_dict1:
@@ -1526,7 +1526,7 @@
}
protocol_index += 2
return console_dict
- raise vimconn.vimconnUnexpectedResponse("Unexpected response from VIM")
+ raise vimconn.VimConnUnexpectedResponse("Unexpected response from VIM")
except (nvExceptions.NotFound, ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.BadRequest, ConnectionError) as e:
self._format_exception(e)
@@ -1676,11 +1676,11 @@
except Exception as e:
self.logger.error("Error getting vm interface information {}: {}".format(type(e).__name__, e),
exc_info=True)
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting vm status: %s", str(e))
vm['status'] = "DELETED"
vm['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting vm status: %s", str(e))
vm['status'] = "VIM_ERROR"
vm['error_msg'] = str(e)
@@ -1737,7 +1737,7 @@
elif console_type == "spice-html5":
console_dict = server.get_spice_console(console_type)
else:
- raise vimconn.vimconnException("console type '{}' not allowed".format(console_type),
+ raise vimconn.VimConnException("console type '{}' not allowed".format(console_type),
http_code=vimconn.HTTP_Bad_Request)
try:
console_url = console_dict["console"]["url"]
@@ -1746,7 +1746,7 @@
suffix_index = console_url[protocol_index+2:].find("/") + protocol_index+2
port_index = console_url[protocol_index+2:suffix_index].find(":") + protocol_index+2
if protocol_index < 0 or port_index<0 or suffix_index<0:
- raise vimconn.vimconnException("Unexpected response from VIM " + str(console_dict))
+ raise vimconn.VimConnException("Unexpected response from VIM " + str(console_dict))
console_dict2={"protocol": console_url[0:protocol_index],
"server": console_url[protocol_index+2 : port_index],
"port": int(console_url[port_index+1 : suffix_index]),
@@ -1754,7 +1754,7 @@
}
return console_dict2
except Exception as e:
- raise vimconn.vimconnException("Unexpected response from VIM " + str(console_dict))
+ raise vimconn.VimConnException("Unexpected response from VIM " + str(console_dict))
return None
except (ksExceptions.ClientException, nvExceptions.ClientException, nvExceptions.NotFound, ConnectionError) as e:
@@ -1786,9 +1786,9 @@
if vlanID not in used_vlanIDs:
return vlanID
except Exception as exp:
- raise vimconn.vimconnException("Exception {} occurred while generating VLAN ID.".format(exp))
+ raise vimconn.VimConnException("Exception {} occurred while generating VLAN ID.".format(exp))
else:
- raise vimconn.vimconnConflictException("Unable to create the SRIOV VLAN network."\
+ raise vimconn.VimConnConflictException("Unable to create the SRIOV VLAN network."\
" All given Vlan IDs {} are in use.".format(self.config.get('dataplane_net_vlan_range')))
@@ -1820,9 +1820,9 @@
if vlanID not in used_vlanIDs:
return vlanID
except Exception as exp:
- raise vimconn.vimconnException("Exception {} occurred while generating VLAN ID.".format(exp))
+ raise vimconn.VimConnException("Exception {} occurred while generating VLAN ID.".format(exp))
else:
- raise vimconn.vimconnConflictException("Unable to create the VLAN segment."
+ raise vimconn.VimConnConflictException("Unable to create the VLAN segment."
" All VLAN IDs {} are in use.".format(self.config.get('multisegment_vlan_range')))
@@ -1838,21 +1838,21 @@
vlanID_pattern = r'(\d)*-(\d)*$'
match_obj = re.match(vlanID_pattern, vlan_range)
if not match_obj:
- raise vimconn.vimconnConflictException("Invalid VLAN range for {}: {}.You must provide "\
+ raise vimconn.VimConnConflictException("Invalid VLAN range for {}: {}.You must provide "\
"'{}' in format [start_ID - end_ID].".format(text_vlan_range, vlanID_range, text_vlan_range))
start_vlanid , end_vlanid = map(int,vlan_range.split("-"))
if start_vlanid <= 0 :
- raise vimconn.vimconnConflictException("Invalid VLAN range for {}: {}."\
+ raise vimconn.VimConnConflictException("Invalid VLAN range for {}: {}."\
"Start ID can not be zero. For VLAN "\
"networks valid IDs are 1 to 4094 ".format(text_vlan_range, vlanID_range))
if end_vlanid > 4094 :
- raise vimconn.vimconnConflictException("Invalid VLAN range for {}: {}."\
+ raise vimconn.VimConnConflictException("Invalid VLAN range for {}: {}."\
"End VLAN ID can not be greater than 4094. For VLAN "\
"networks valid IDs are 1 to 4094 ".format(text_vlan_range, vlanID_range))
if start_vlanid > end_vlanid:
- raise vimconn.vimconnConflictException("Invalid VLAN range for {}: {}."\
+ raise vimconn.VimConnConflictException("Invalid VLAN range for {}: {}."\
"You must provide '{}' in format start_ID - end_ID and "\
"start_ID < end_ID ".format(text_vlan_range, vlanID_range, text_vlan_range))
@@ -1970,12 +1970,12 @@
new_class = None
self._reload_connection()
if ctype not in supportedClassificationTypes:
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
'OpenStack VIM connector doesn\'t support provided '
'Classification Type {}, supported ones are: '
'{}'.format(ctype, supportedClassificationTypes))
if not self._validate_classification(ctype, definition):
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
'Incorrect Classification definition '
'for the type specified.')
classification_dict = definition
@@ -1995,10 +1995,10 @@
filter_dict = {"id": class_id}
class_list = self.get_classification_list(filter_dict)
if len(class_list) == 0:
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Classification '{}' not found".format(class_id))
elif len(class_list) > 1:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
"Found more than one Classification with this criteria")
classification = class_list[0]
return classification
@@ -2040,11 +2040,11 @@
if sfc_encap:
correlation = 'nsh'
if len(ingress_ports) != 1:
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
"OpenStack VIM connector can only have "
"1 ingress port per SFI")
if len(egress_ports) != 1:
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
"OpenStack VIM connector can only have "
"1 egress port per SFI")
sfi_dict = {'name': name,
@@ -2071,9 +2071,9 @@
filter_dict = {"id": sfi_id}
sfi_list = self.get_sfi_list(filter_dict)
if len(sfi_list) == 0:
- raise vimconn.vimconnNotFoundException("Service Function Instance '{}' not found".format(sfi_id))
+ raise vimconn.VimConnNotFoundException("Service Function Instance '{}' not found".format(sfi_id))
elif len(sfi_list) > 1:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
'Found more than one Service Function Instance '
'with this criteria')
sfi = sfi_list[0]
@@ -2117,7 +2117,7 @@
for instance in sfis:
sfi = self.get_sfi(instance)
if sfi.get('sfc_encap') != sfc_encap:
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
"OpenStack VIM connector requires all SFIs of the "
"same SF to share the same SFC Encapsulation")
sf_dict = {'name': name,
@@ -2142,10 +2142,10 @@
filter_dict = {"id": sf_id}
sf_list = self.get_sf_list(filter_dict)
if len(sf_list) == 0:
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Service Function '{}' not found".format(sf_id))
elif len(sf_list) > 1:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
"Found more than one Service Function with this criteria")
sf = sf_list[0]
return sf
@@ -2211,10 +2211,10 @@
filter_dict = {"id": sfp_id}
sfp_list = self.get_sfp_list(filter_dict)
if len(sfp_list) == 0:
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Service Function Path '{}' not found".format(sfp_id))
elif len(sfp_list) > 1:
- raise vimconn.vimconnConflictException(
+ raise vimconn.VimConnConflictException(
"Found more than one Service Function Path with this criteria")
sfp = sfp_list[0]
return sfp
@@ -2278,11 +2278,11 @@
if sfp_vim.get('fault'):
sfp['error_msg'] = str(sfp_vim['fault'])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting sfp status: %s", str(e))
sfp['status'] = "DELETED"
sfp['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting sfp status: %s", str(e))
sfp['status'] = "VIM_ERROR"
sfp['error_msg'] = str(e)
@@ -2322,11 +2322,11 @@
if sfi_vim.get('fault'):
sfi['error_msg'] = str(sfi_vim['fault'])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting sfi status: %s", str(e))
sfi['status'] = "DELETED"
sfi['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting sfi status: %s", str(e))
sfi['status'] = "VIM_ERROR"
sfi['error_msg'] = str(e)
@@ -2366,11 +2366,11 @@
if sf_vim.get('fault'):
sf['error_msg'] = str(sf_vim['fault'])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting sf status: %s", str(e))
sf['status'] = "DELETED"
sf['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting sf status: %s", str(e))
sf['status'] = "VIM_ERROR"
sf['error_msg'] = str(e)
@@ -2411,11 +2411,11 @@
if classification_vim.get('fault'):
classification['error_msg'] = str(classification_vim['fault'])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting classification status: %s", str(e))
classification['status'] = "DELETED"
classification['error_msg'] = str(e)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("Exception getting classification status: %s", str(e))
classification['status'] = "VIM_ERROR"
classification['error_msg'] = str(e)
diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/requirements.txt
index 9c7dd5c..2a4b69e 100644
--- a/RO-VIM-openstack/requirements.txt
+++ b/RO-VIM-openstack/requirements.txt
@@ -23,4 +23,4 @@
#TODO py3 python-keystoneclient
#TODO py3 python-glanceclient
#TODO py3 python-cinderclient
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py
index 56c798b..8c3b1ee 100644
--- a/RO-VIM-openstack/setup.py
+++ b/RO-VIM-openstack/setup.py
@@ -47,12 +47,12 @@
install_requires=[
"python-openstackclient", "python-neutronclient",
"requests", "netaddr", "PyYAML",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
# TODO py3 "networking-l2gw"
# "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient",
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_openstack = osm_rovim_openstack.vimconn_openstack'],
+ 'osm_rovim.plugins': ['rovim_openstack = osm_rovim_openstack.vimconn_openstack:vimconnector'],
},
)
diff --git a/RO-VIM-openstack/stdeb.cfg b/RO-VIM-openstack/stdeb.cfg
index ef5f94d..a0adf96 100644
--- a/RO-VIM-openstack/stdeb.cfg
+++ b/RO-VIM-openstack/stdeb.cfg
@@ -15,6 +15,7 @@
[DEFAULT]
X-Python3-Version : >= 3.5
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
Depends3: python3-openstackclient, python3-neutronclient, python3-requests, python3-netaddr, python3-yaml,
- python3-osm-ro, python3-pip
+ python3-osm-ro-plugin, python3-pip
# TODO py3 python3-networking-l2gw
diff --git a/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py b/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
index 9490485..0c24003 100644
--- a/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
+++ b/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
@@ -27,7 +27,7 @@
__author__="Alfonso Tierno, Gerardo Garcia"
__date__ ="$26-aug-2014 11:09:29$"
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import requests
import json
import yaml
@@ -324,10 +324,10 @@
}
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None,
log_level="DEBUG", config={}, persistent_info={}):
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level, config)
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level, config)
self.tenant = None
self.headers_req = {'content-type': 'application/json'}
self.logger = logging.getLogger('openmano.vim.openvim')
@@ -343,7 +343,7 @@
self.tenant = value
elif index=='tenant_name':
self.tenant = None
- vimconn.vimconnector.__setitem__(self,index, value)
+ vimconn.VimConnector.__setitem__(self,index, value)
def _get_my_tenant(self):
'''Obtain uuid of my tenant from name
@@ -358,13 +358,13 @@
try:
tenant_list = vim_response.json()["tenants"]
if len(tenant_list) == 0:
- raise vimconn.vimconnNotFoundException("No tenant found for name '{}'".format(self.tenant_name))
+ raise vimconn.VimConnNotFoundException("No tenant found for name '{}'".format(self.tenant_name))
elif len(tenant_list) > 1:
- raise vimconn.vimconnConflictException ("More that one tenant found for name '{}'".format(self.tenant_name))
+ raise vimconn.VimConnConflictException ("More that one tenant found for name '{}'".format(self.tenant_name))
self.tenant = tenant_list[0]["id"]
return self.tenant
except Exception as e:
- raise vimconn.vimconnUnexpectedResponse("Get VIM tenant {} '{}'".format(type(e).__name__, str(e)))
+ raise vimconn.VimConnUnexpectedResponse("Get VIM tenant {} '{}'".format(type(e).__name__, str(e)))
def _format_jsonerror(self,http_response):
#DEPRECATED, to delete in the future
@@ -409,24 +409,24 @@
def _format_request_exception(self, request_exception):
'''Transform a request exception into a vimconn exception'''
if isinstance(request_exception, js_e.ValidationError):
- raise vimconn.vimconnUnexpectedResponse("jsonschema exception '{}' at '{}'".format(request_exception.message, request_exception.path))
+ raise vimconn.VimConnUnexpectedResponse("jsonschema exception '{}' at '{}'".format(request_exception.message, request_exception.path))
elif isinstance(request_exception, requests.exceptions.HTTPError):
- raise vimconn.vimconnUnexpectedResponse(type(request_exception).__name__ + ": " + str(request_exception))
+ raise vimconn.VimConnUnexpectedResponse(type(request_exception).__name__ + ": " + str(request_exception))
else:
- raise vimconn.vimconnConnectionException(type(request_exception).__name__ + ": " + str(request_exception))
+ raise vimconn.VimConnConnectionException(type(request_exception).__name__ + ": " + str(request_exception))
def _check_http_request_response(self, request_response):
'''Raise a vimconn exception if the response is not Ok'''
if request_response.status_code >= 200 and request_response.status_code < 300:
return
if request_response.status_code == vimconn.HTTP_Unauthorized:
- raise vimconn.vimconnAuthException(request_response.text)
+ raise vimconn.VimConnAuthException(request_response.text)
elif request_response.status_code == vimconn.HTTP_Not_Found:
- raise vimconn.vimconnNotFoundException(request_response.text)
+ raise vimconn.VimConnNotFoundException(request_response.text)
elif request_response.status_code == vimconn.HTTP_Conflict:
- raise vimconn.vimconnConflictException(request_response.text)
+ raise vimconn.VimConnConflictException(request_response.text)
else:
- raise vimconn.vimconnUnexpectedResponse("VIM HTTP_response {}, {}".format(request_response.status_code, str(request_response.text)))
+ raise vimconn.VimConnUnexpectedResponse("VIM HTTP_response {}, {}".format(request_response.status_code, str(request_response.text)))
def new_tenant(self,tenant_name,tenant_description):
'''Adds a new tenant to VIM with this name and description, returns the tenant identifier'''
@@ -759,9 +759,9 @@
#if r is not None:
# self.logger.warn("Warning: remove extra items %s", str(r))
if len(response['images'])==0:
- raise vimconn.vimconnNotFoundException("Image not found at VIM with path '{}'".format(path))
+ raise vimconn.VimConnNotFoundException("Image not found at VIM with path '{}'".format(path))
elif len(response['images'])>1:
- raise vimconn.vimconnConflictException("More than one image found at VIM with path '{}'".format(path))
+ raise vimconn.VimConnConflictException("More than one image found at VIM with path '{}'".format(path))
return response['images'][0]['id']
except (requests.exceptions.RequestException, js_e.ValidationError) as e:
self._format_request_exception(e)
@@ -1033,11 +1033,11 @@
if vm['status'] == "ACTIVE" and not management_ip:
vm['status'] = "ACTIVE:NoMgmtIP"
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting vm status: %s", str(e))
vm['status'] = "DELETED"
vm['error_msg'] = str(e)
- except (requests.exceptions.RequestException, js_e.ValidationError, vimconn.vimconnException) as e:
+ except (requests.exceptions.RequestException, js_e.ValidationError, vimconn.VimConnException) as e:
self.logger.error("Exception getting vm status: %s", str(e))
vm['status'] = "VIM_ERROR"
vm['error_msg'] = str(e)
@@ -1083,11 +1083,11 @@
if net_vim.get('last_error'):
net['error_msg'] = net_vim['last_error']
net["vim_info"] = yaml.safe_dump(net_vim)
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
self.logger.error("Exception getting net status: %s", str(e))
net['status'] = "DELETED"
net['error_msg'] = str(e)
- except (requests.exceptions.RequestException, js_e.ValidationError, vimconn.vimconnException) as e:
+ except (requests.exceptions.RequestException, js_e.ValidationError, vimconn.VimConnException) as e:
self.logger.error("Exception getting net status: %s", str(e))
net['status'] = "VIM_ERROR"
net['error_msg'] = str(e)
@@ -1100,7 +1100,7 @@
try:
self._get_my_tenant()
if "console" in action_dict:
- raise vimconn.vimconnException("getting console is not available at openvim", http_code=vimconn.HTTP_Service_Unavailable)
+ raise vimconn.VimConnException("getting console is not available at openvim", http_code=vimconn.HTTP_Service_Unavailable)
url = self.url+'/'+self.tenant+'/servers/'+vm_id+"/action"
self.logger.info("Action over VM instance POST %s", url)
vim_response = requests.post(url, headers = self.headers_req, data=json.dumps(action_dict) )
diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/requirements.txt
index 34a2518..5802df5 100644
--- a/RO-VIM-openvim/requirements.txt
+++ b/RO-VIM-openvim/requirements.txt
@@ -16,4 +16,4 @@
PyYAML
requests
netaddr
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py
index 7a9070c..ab99577 100644
--- a/RO-VIM-openvim/setup.py
+++ b/RO-VIM-openvim/setup.py
@@ -46,10 +46,10 @@
include_package_data=True,
install_requires=[
"requests", "netaddr", "PyYAML",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_openvim = osm_rovim_openvim.vimconn_openvim'],
+ 'osm_rovim.plugins': ['rovim_openvim = osm_rovim_openvim.vimconn_openvim:vimconnector'],
},
)
diff --git a/RO-VIM-openvim/stdeb.cfg b/RO-VIM-openvim/stdeb.cfg
index 50f9821..b5efb97 100644
--- a/RO-VIM-openvim/stdeb.cfg
+++ b/RO-VIM-openvim/stdeb.cfg
@@ -15,4 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin
diff --git a/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py b/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py
index 1fe3e65..04f9d80 100755
--- a/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py
+++ b/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py
@@ -23,7 +23,7 @@
from osm_rovim_vmware.vimconn_vmware import vimconnector
-from osm_ro.vimconn import vimconnUnexpectedResponse, vimconnNotFoundException,vimconnException
+from osm_ro_plugin.vimconn import VimConnUnexpectedResponse, VimConnNotFoundException,VimConnException
from pyvcloud.vcd.client import Client
from lxml import etree as lxmlElementTree
from pyvcloud.vcd.org import Org
@@ -78,7 +78,7 @@
perform_request.return_value.content = xml_resp.vdc_xml_response
# call to VIM connector method with invalid id
- self.assertRaises(vimconnNotFoundException,self.vim.get_network,'mgmt-net')
+ self.assertRaises(VimConnNotFoundException,self.vim.get_network,'mgmt-net')
@mock.patch.object(vimconnector,'perform_request')
@mock.patch.object(vimconnector,'get_vdc_details')
@@ -189,7 +189,7 @@
<OrgVdcNetwork></OrgVdcNetwork>"""
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnUnexpectedResponse,self.vim.new_network,
+ self.assertRaises(VimConnUnexpectedResponse,self.vim.new_network,
'test_net',
'bridge')
@@ -222,7 +222,7 @@
# assumed return value from VIM connector
get_vcd_network.return_value = False
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnNotFoundException,self.vim.delete_network,
+ self.assertRaises(VimConnNotFoundException,self.vim.delete_network,
'2a23e5d1-42a2-0648-bc92-cb508046bf87')
def test_get_flavor(self):
@@ -244,7 +244,7 @@
"""
vimconnector.flavorlist = {}
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnNotFoundException,self.vim.get_flavor,
+ self.assertRaises(VimConnNotFoundException,self.vim.get_flavor,
'a646eb8a-95bd-4e81-8321-5413ee72b62e')
def test_new_flavor(self):
@@ -287,7 +287,7 @@
]
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnNotFoundException, self.vim.delete_image, 'invali3453')
+ self.assertRaises(VimConnNotFoundException, self.vim.delete_image, 'invali3453')
@mock.patch.object(vimconnector,'get_vdc_details')
@mock.patch.object(vimconnector,'connect')
@@ -550,7 +550,7 @@
create_vdc.return_value = None
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnException,self.vim.new_tenant,tenant_name)
+ self.assertRaises(VimConnException,self.vim.new_tenant,tenant_name)
@mock.patch.object(vimconnector,'connect_as_admin')
@mock.patch.object(vimconnector,'connect')
@@ -587,7 +587,7 @@
perform_request.return_value.status_code = 201
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnNotFoundException,self.vim.delete_tenant,tenant_id)
+ self.assertRaises(VimConnNotFoundException,self.vim.delete_tenant,tenant_id)
@mock.patch.object(vimconnector,'get_vdc_details')
@mock.patch.object(Org,'list_catalogs')
@@ -708,7 +708,7 @@
content = "Bad request error")]
# call to VIM connector method
- self.assertRaises(vimconnUnexpectedResponse,self.vim.new_vminstance,
+ self.assertRaises(VimConnUnexpectedResponse,self.vim.new_vminstance,
name='Test1_vm',
image_id=image_id,
flavor_id=flavor_id,
@@ -779,7 +779,7 @@
get_catalogid.return_value = '34925a30-0f4a-4018-9759-0d6799063b51'
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnException,self.vim.new_image,{'name':'TestImage', 'location':path})
+ self.assertRaises(VimConnException,self.vim.new_image,{'name':'TestImage', 'location':path})
@mock.patch.object(vimconnector,'connect_as_admin')
@mock.patch.object(vimconnector,'perform_request')
@@ -878,7 +878,7 @@
create_catalog.return_value = catalog
upload_vimimage.return_value = False
get_catalogid.return_value = '7208-0f6777052c30'
- self.assertRaises(vimconnException, self.vim.get_image_id_from_path, path)
+ self.assertRaises(VimConnException, self.vim.get_image_id_from_path, path)
@mock.patch.object(vimconnector,'get_vdc_details')
@mock.patch.object(vimconnector,'connect')
@@ -915,7 +915,7 @@
get_vapp_details_rest.return_value = False
# assert verified expected and return result from VIM connector
- self.assertRaises(vimconnNotFoundException, self.vim.get_vminstance,invalid_vmid)
+ self.assertRaises(VimConnNotFoundException, self.vim.get_vminstance,invalid_vmid)
@mock.patch.object(vimconnector,'connect')
@mock.patch.object(vimconnector,'get_namebyvappid')
@@ -940,7 +940,7 @@
get_vapp.return_value = None
# call to VIM connector method
- self.assertRaises(vimconnException, self.vim.delete_vminstance,vm_id)
+ self.assertRaises(VimConnException, self.vim.delete_vminstance,vm_id)
@mock.patch.object(vimconnector,'get_vcd_network')
def test_refresh_nets_status_negative(self, get_vcd_network):
@@ -977,4 +977,4 @@
self.vim.client = self.vim.connect()
# call to VIM connector method
- self.assertRaises(vimconnException, self.vim.action_vminstance, vm_id,{'invalid': None})
+ self.assertRaises(VimConnException, self.vim.action_vminstance, vm_id,{'invalid': None})
diff --git a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
index 6bb83e4..b698f4c 100644
--- a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
+++ b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
@@ -26,7 +26,7 @@
"""
from lxml import etree as lxmlElementTree
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
from progressbar import Percentage, Bar, ETA, FileTransferSpeed, ProgressBar
from pyVim.connect import SmartConnect, Disconnect
from pyVmomi import vim, vmodl # @UnresolvedImport
@@ -110,7 +110,7 @@
}
-class vimconnector(vimconn.vimconnector):
+class vimconnector(vimconn.VimConnector):
# dict used to store flavor in memory
flavorlist = {}
@@ -148,7 +148,7 @@
Nothing.
"""
- vimconn.vimconnector.__init__(self, uuid, name, tenant_id, tenant_name, url,
+ vimconn.VimConnector.__init__(self, uuid, name, tenant_id, tenant_name, url,
url_admin, user, passwd, log_level, config)
self.logger = logging.getLogger('openmano.vim.vmware')
@@ -192,14 +192,14 @@
self.admin_user = config['admin_username']
self.admin_password = config['admin_password']
except KeyError:
- raise vimconn.vimconnException(message="Error admin username or admin password is empty.")
+ raise vimconn.VimConnException(message="Error admin username or admin password is empty.")
try:
self.nsx_manager = config['nsx_manager']
self.nsx_user = config['nsx_user']
self.nsx_password = config['nsx_password']
except KeyError:
- raise vimconn.vimconnException(message="Error: nsx manager or nsx user or nsx password is empty in Config")
+ raise vimconn.VimConnException(message="Error: nsx manager or nsx user or nsx password is empty in Config")
self.vcenter_ip = config.get("vcenter_ip", None)
self.vcenter_port = config.get("vcenter_port", None)
@@ -213,7 +213,7 @@
# try:
# self.dvs_name = config['dv_switch_name']
# except KeyError:
-# raise vimconn.vimconnException(message="Error: distributed virtaul switch name is empty in Config")
+# raise vimconn.VimConnException(message="Error: distributed virtaul switch name is empty in Config")
#
# self.vlanID_range = config.get("vlanID_range", None)
@@ -221,7 +221,7 @@
self.client = None
if not url:
- raise vimconn.vimconnException('url param can not be NoneType')
+ raise vimconn.VimConnException('url param can not be NoneType')
if not self.url_admin: # try to use normal url
self.url_admin = self.url
@@ -301,7 +301,7 @@
client_as_admin = Client(host, verify_ssl_certs=False, api_version=API_VERSION)
client_as_admin.set_credentials(BasicLoginCredentials(self.admin_user, org, self.admin_password))
except Exception as e:
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"Can't connect to vCloud director as: {} with exception {}".format(self.admin_user, e))
return client_as_admin
@@ -320,7 +320,7 @@
client = Client(host, verify_ssl_certs=False, api_version=API_VERSION)
client.set_credentials(BasicLoginCredentials(self.user, self.org_name, self.passwd))
except Exception as e:
- raise vimconn.vimconnConnectionException("Can't connect to vCloud director org: "
+ raise vimconn.VimConnConnectionException("Can't connect to vCloud director org: "
"{} as user {} with exception: {}".format(self.org_name,
self.user,
e))
@@ -340,7 +340,7 @@
"""
client = self.connect()
if not client:
- raise vimconn.vimconnConnectionException("Failed to connect vCD.")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD.")
self.client = client
try:
@@ -353,7 +353,7 @@
self.logger.debug("Setting organization UUID {}".format(self.org_uuid))
break
else:
- raise vimconn.vimconnException("Vcloud director organization {} not found".format(self.org_name))
+ raise vimconn.VimConnException("Vcloud director organization {} not found".format(self.org_name))
# if well good we require for org details
org_details_dict = self.get_org(org_uuid=self.org_uuid)
@@ -369,7 +369,7 @@
self.org_name))
break
else:
- raise vimconn.vimconnException("Tenant name indicated but not present in vcloud director.")
+ raise vimconn.VimConnException("Tenant name indicated but not present in vcloud director.")
# case two we have tenant_id but we don't have tenant name so we find and set it.
if self.tenant_id is not None and self.tenant_name is None and 'vdcs' in org_details_dict:
vdcs_dict = org_details_dict['vdcs']
@@ -380,7 +380,7 @@
self.org_name))
break
else:
- raise vimconn.vimconnException("Tenant id indicated but not present in vcloud director")
+ raise vimconn.VimConnException("Tenant id indicated but not present in vcloud director")
self.logger.debug("Setting organization uuid {}".format(self.org_uuid))
except Exception as e:
self.logger.debug("Failed initialize organization UUID for org {}: {}".format(self.org_name), e)
@@ -397,7 +397,7 @@
Return:
returns the tenant identifier in UUID format.
- If action is failed method will throw vimconn.vimconnException method
+ If action is failed method will throw vimconn.VimConnException method
"""
vdc_task = self.create_vdc(vdc_name=tenant_name)
if vdc_task is not None:
@@ -405,7 +405,7 @@
self.logger.info("Created new vdc {} and uuid: {}".format(tenant_name, vdc_uuid))
return vdc_uuid
else:
- raise vimconn.vimconnException("Failed create tenant {}".format(tenant_name))
+ raise vimconn.VimConnException("Failed create tenant {}".format(tenant_name))
def delete_tenant(self, tenant_id=None):
""" Delete a tenant from VIM
@@ -418,7 +418,7 @@
"""
vca = self.connect_as_admin()
if not vca:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
if tenant_id is not None:
if vca._session:
@@ -436,7 +436,7 @@
self.logger.debug("delete_tenant():GET REST API call {} failed. "
"Return status code {}".format(orgvdc_herf,
response.status_code))
- raise vimconn.vimconnNotFoundException("Fail to get tenant {}".format(tenant_id))
+ raise vimconn.VimConnNotFoundException("Fail to get tenant {}".format(tenant_id))
lxmlroot_respond = lxmlElementTree.fromstring(response.content)
namespaces = {prefix: uri for prefix, uri in lxmlroot_respond.nsmap.items() if prefix}
@@ -455,10 +455,10 @@
self.logger.debug("delete_tenant(): DELETE REST API call {} failed. "
"Return status code {}".format(vdc_remove_href,
response.status_code))
- raise vimconn.vimconnException("Fail to delete tenant with ID {}".format(tenant_id))
+ raise vimconn.VimConnException("Fail to delete tenant with ID {}".format(tenant_id))
else:
self.logger.debug("delete_tenant():Incorrect tenant ID {}".format(tenant_id))
- raise vimconn.vimconnNotFoundException("Fail to get tenant {}".format(tenant_id))
+ raise vimconn.VimConnNotFoundException("Fail to get tenant {}".format(tenant_id))
def get_tenant_list(self, filter_dict={}):
"""Obtain tenants of VIM
@@ -490,7 +490,7 @@
except Exception:
self.logger.debug("Error in get_tenant_list()")
self.logger.debug(traceback.format_exc())
- raise vimconn.vimconnException("Incorrect state. {}")
+ raise vimconn.VimConnException("Incorrect state. {}")
return vdclist
@@ -533,7 +533,7 @@
# ############# Stub code for SRIOV #################
# if net_type == "data" or net_type == "ptp":
# if self.config.get('dv_switch_name') == None:
-# raise vimconn.vimconnConflictException("You must provide 'dv_switch_name' at config value")
+# raise vimconn.VimConnConflictException("You must provide 'dv_switch_name' at config value")
# network_uuid = self.create_dvPort_group(net_name)
parent_network_uuid = None
@@ -548,7 +548,7 @@
if network_uuid is not None:
return network_uuid, created_items
else:
- raise vimconn.vimconnUnexpectedResponse("Failed create a new network {}".format(net_name))
+ raise vimconn.VimConnUnexpectedResponse("Failed create a new network {}".format(net_name))
def get_vcd_network_list(self):
""" Method available organization for a logged in tenant
@@ -560,11 +560,11 @@
self.logger.debug("get_vcd_network_list(): retrieving network list for vcd {}".format(self.tenant_name))
if not self.tenant_name:
- raise vimconn.vimconnConnectionException("Tenant name is empty.")
+ raise vimconn.VimConnConnectionException("Tenant name is empty.")
_, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnConnectionException("Can't retrieve information for a VDC {}".format(self.tenant_name))
+ raise vimconn.VimConnConnectionException("Can't retrieve information for a VDC {}".format(self.tenant_name))
vdc_uuid = vdc.get('id').split(":")[3]
if self.client._session:
@@ -575,7 +575,7 @@
headers=headers)
if response.status_code != 200:
self.logger.error("Failed to get vdc content")
- raise vimconn.vimconnNotFoundException("Failed to get vdc content")
+ raise vimconn.VimConnNotFoundException("Failed to get vdc content")
else:
content = XmlElementTree.fromstring(response.text)
@@ -590,7 +590,7 @@
if response.status_code != 200:
self.logger.error("Failed to get network content")
- raise vimconn.vimconnNotFoundException("Failed to get network content")
+ raise vimconn.VimConnNotFoundException("Failed to get network content")
else:
net_details = XmlElementTree.fromstring(response.text)
@@ -648,11 +648,11 @@
self.logger.debug("get_network_list(): retrieving network list for vcd {}".format(self.tenant_name))
if not self.tenant_name:
- raise vimconn.vimconnConnectionException("Tenant name is empty.")
+ raise vimconn.VimConnConnectionException("Tenant name is empty.")
_, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnConnectionException(
+ raise vimconn.VimConnConnectionException(
"Can't retrieve information for a VDC {}.".format(self.tenant_name))
try:
@@ -666,7 +666,7 @@
headers=headers)
if response.status_code != 200:
self.logger.error("Failed to get vdc content")
- raise vimconn.vimconnNotFoundException("Failed to get vdc content")
+ raise vimconn.VimConnNotFoundException("Failed to get vdc content")
else:
content = XmlElementTree.fromstring(response.text)
@@ -680,7 +680,7 @@
if response.status_code != 200:
self.logger.error("Failed to get network content")
- raise vimconn.vimconnNotFoundException("Failed to get network content")
+ raise vimconn.VimConnNotFoundException("Failed to get network content")
else:
net_details = XmlElementTree.fromstring(response.text)
@@ -723,10 +723,10 @@
network_list.append(filtered_entry)
except Exception as e:
self.logger.debug("Error in get_network_list", exc_info=True)
- if isinstance(e, vimconn.vimconnException):
+ if isinstance(e, vimconn.VimConnException):
raise
else:
- raise vimconn.vimconnNotFoundException("Failed : Networks list not found {} ".format(e))
+ raise vimconn.VimConnNotFoundException("Failed : Networks list not found {} ".format(e))
self.logger.debug("Returning {}".format(network_list))
return network_list
@@ -746,7 +746,7 @@
headers=headers)
if response.status_code != 200:
self.logger.error("Failed to get vdc content")
- raise vimconn.vimconnNotFoundException("Failed to get vdc content")
+ raise vimconn.VimConnNotFoundException("Failed to get vdc content")
else:
content = XmlElementTree.fromstring(response.text)
@@ -761,7 +761,7 @@
if response.status_code != 200:
self.logger.error("Failed to get network content")
- raise vimconn.vimconnNotFoundException("Failed to get network content")
+ raise vimconn.VimConnNotFoundException("Failed to get network content")
else:
net_details = XmlElementTree.fromstring(response.text)
@@ -784,14 +784,14 @@
self.logger.debug("Returning {}".format(filter_dict))
return filter_dict
else:
- raise vimconn.vimconnNotFoundException("Network {} not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("Network {} not found".format(net_id))
except Exception as e:
self.logger.debug("Error in get_network")
self.logger.debug(traceback.format_exc())
- if isinstance(e, vimconn.vimconnException):
+ if isinstance(e, vimconn.VimConnException):
raise
else:
- raise vimconn.vimconnNotFoundException("Failed : Network not found {} ".format(e))
+ raise vimconn.VimConnNotFoundException("Failed : Network not found {} ".format(e))
return filter_dict
@@ -820,7 +820,7 @@
if self.delete_network_action(network_uuid=net_id):
return net_id
else:
- raise vimconn.vimconnNotFoundException("Network {} not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("Network {} not found".format(net_id))
def refresh_nets_status(self, net_list):
"""Get the status of the networks
@@ -867,7 +867,7 @@
Returns the flavor dict details {'id':<>, 'name':<>, other vim specific } #TODO to concrete
"""
if flavor_id not in vimconnector.flavorlist:
- raise vimconn.vimconnNotFoundException("Flavor not found.")
+ raise vimconn.VimConnNotFoundException("Flavor not found.")
return vimconnector.flavorlist[flavor_id]
def new_flavor(self, flavor_data):
@@ -899,11 +899,11 @@
disk = flavor_data.get(FLAVOR_DISK_KEY, 0)
if not isinstance(ram, int):
- raise vimconn.vimconnException("Non-integer value for ram")
+ raise vimconn.VimConnException("Non-integer value for ram")
elif not isinstance(cpu, int):
- raise vimconn.vimconnException("Non-integer value for cpu")
+ raise vimconn.VimConnException("Non-integer value for cpu")
elif not isinstance(disk, int):
- raise vimconn.vimconnException("Non-integer value for disk")
+ raise vimconn.VimConnException("Non-integer value for disk")
extended_flv = flavor_data.get("extended")
if extended_flv:
@@ -936,7 +936,7 @@
Returns the used id or raise an exception
"""
if flavor_id not in vimconnector.flavorlist:
- raise vimconn.vimconnNotFoundException("Flavor not found.")
+ raise vimconn.VimConnNotFoundException("Flavor not found.")
vimconnector.flavorlist.pop(flavor_id, None)
return flavor_id
@@ -961,7 +961,7 @@
"""
conn = self.connect_as_admin()
if not conn:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
# Get Catalog details
url_list = [self.url, '/api/catalog/', image_id]
catalog_herf = ''.join(url_list)
@@ -977,7 +977,7 @@
self.logger.debug("delete_image():GET REST API call {} failed. "
"Return status code {}".format(catalog_herf,
response.status_code))
- raise vimconn.vimconnNotFoundException("Fail to get image {}".format(image_id))
+ raise vimconn.VimConnNotFoundException("Fail to get image {}".format(image_id))
lxmlroot_respond = lxmlElementTree.fromstring(response.content)
namespaces = {prefix: uri for prefix, uri in lxmlroot_respond.nsmap.items() if prefix}
@@ -996,7 +996,7 @@
self.logger.debug("delete_image():GET REST API call {} failed. "
"Return status code {}".format(catalog_herf,
response.status_code))
- raise vimconn.vimconnNotFoundException("Fail to get catalogItem {} for catalog {}".format(
+ raise vimconn.VimConnNotFoundException("Fail to get catalogItem {} for catalog {}".format(
catalogItem,
image_id))
@@ -1012,7 +1012,7 @@
if response.status_code == requests.codes.no_content:
self.logger.debug("Deleted Catalog item {}".format(catalogItem))
else:
- raise vimconn.vimconnException("Fail to delete Catalog Item {}".format(catalogItem))
+ raise vimconn.VimConnException("Fail to delete Catalog Item {}".format(catalogItem))
# Remove catalog
url_list = [self.url, '/api/admin/catalog/', image_id]
@@ -1025,7 +1025,7 @@
self.logger.debug("Deleted Catalog {}".format(image_id))
return image_id
else:
- raise vimconn.vimconnException("Fail to delete Catalog {}".format(image_id))
+ raise vimconn.VimConnException("Fail to delete Catalog {}".format(image_id))
def catalog_exists(self, catalog_name, catalogs):
"""
@@ -1202,7 +1202,7 @@
except Exception as exp:
self.logger.debug("Failed while uploading OVF to catalog {} for OVF file {} with Exception {}"
.format(catalog_name, media_file_name, exp))
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"Failed while uploading OVF to catalog {} for OVF file {} with Exception {}"
.format(catalog_name, media_file_name, exp))
@@ -1303,13 +1303,13 @@
"""
if not path:
- raise vimconn.vimconnException("Image path can't be None.")
+ raise vimconn.VimConnException("Image path can't be None.")
if not os.path.isfile(path):
- raise vimconn.vimconnException("Can't read file. File not found.")
+ raise vimconn.VimConnException("Can't read file. File not found.")
if not os.access(path, os.R_OK):
- raise vimconn.vimconnException("Can't read file. Check file permission to read.")
+ raise vimconn.VimConnException("Can't read file. Check file permission to read.")
self.logger.debug("get_image_id_from_path() client requesting {} ".format(path))
@@ -1317,7 +1317,7 @@
_, file_extension = os.path.splitext(path)
if file_extension != '.ovf':
self.logger.debug("Wrong file extension {} connector support only OVF container.".format(file_extension))
- raise vimconn.vimconnException("Wrong container. vCloud director supports only OVF.")
+ raise vimconn.VimConnException("Wrong container. vCloud director supports only OVF.")
catalog_name = os.path.splitext(filename)[0]
catalog_md5_name = hashlib.md5(path.encode('utf-8')).hexdigest()
@@ -1329,17 +1329,17 @@
catalogs = org.list_catalogs()
except Exception as exp:
self.logger.debug("Failed get catalogs() with Exception {} ".format(exp))
- raise vimconn.vimconnException("Failed get catalogs() with Exception {} ".format(exp))
+ raise vimconn.VimConnException("Failed get catalogs() with Exception {} ".format(exp))
if len(catalogs) == 0:
self.logger.info("Creating a new catalog entry {} in vcloud director".format(catalog_name))
if self.create_vimcatalog(org, catalog_md5_name) is None:
- raise vimconn.vimconnException("Failed create new catalog {} ".format(catalog_md5_name))
+ raise vimconn.VimConnException("Failed create new catalog {} ".format(catalog_md5_name))
result = self.upload_vimimage(vca=org, catalog_name=catalog_md5_name,
media_name=filename, medial_file_name=path, progress=progress)
if not result:
- raise vimconn.vimconnException("Failed create vApp template for catalog {} ".format(catalog_name))
+ raise vimconn.VimConnException("Failed create vApp template for catalog {} ".format(catalog_name))
return self.get_catalogid(catalog_name, catalogs)
else:
for catalog in catalogs:
@@ -1354,12 +1354,12 @@
# if we didn't find existing catalog we create a new one and upload image.
self.logger.debug("Creating new catalog entry {} - {}".format(catalog_name, catalog_md5_name))
if self.create_vimcatalog(org, catalog_md5_name) is None:
- raise vimconn.vimconnException("Failed create new catalog {} ".format(catalog_md5_name))
+ raise vimconn.VimConnException("Failed create new catalog {} ".format(catalog_md5_name))
result = self.upload_vimimage(vca=org, catalog_name=catalog_md5_name,
media_name=filename, medial_file_name=path, progress=progress)
if not result:
- raise vimconn.vimconnException("Failed create vApp template for catalog {} ".format(catalog_md5_name))
+ raise vimconn.VimConnException("Failed create vApp template for catalog {} ".format(catalog_md5_name))
return self.get_catalogid(catalog_md5_name, org.list_catalogs())
@@ -1397,7 +1397,7 @@
self.logger.debug("List of already created catalog items: {}".format(image_list))
return image_list
except Exception as exp:
- raise vimconn.vimconnException("Exception occured while retriving catalog items {}".format(exp))
+ raise vimconn.VimConnException("Exception occured while retriving catalog items {}".format(exp))
def get_vappid(self, vdc=None, vapp_name=None):
""" Method takes vdc object and vApp name and returns vapp uuid or None
@@ -1545,18 +1545,18 @@
for net in net_list:
if net['type'] == "PCI-PASSTHROUGH":
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
"Current vCD version does not support type : {}".format(net['type']))
if len(net_list) > 10:
- raise vimconn.vimconnNotSupportedException(
+ raise vimconn.VimConnNotSupportedException(
"The VM hardware versions 7 and above support upto 10 NICs only")
# if vm already deployed we return existing uuid
# we check for presence of VDC, Catalog entry and Flavor.
org, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"new_vminstance(): Failed create vApp {}: (Failed retrieve VDC information)".format(name))
catalogs = org.list_catalogs()
if catalogs is None:
@@ -1565,14 +1565,14 @@
org = Org(self.client, resource=self.client.get_org())
catalogs = org.list_catalogs()
if catalogs is None:
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"new_vminstance(): Failed create vApp {}: (Failed retrieve catalogs list)".format(name))
catalog_hash_name = self.get_catalogbyid(catalog_uuid=image_id, catalogs=catalogs)
if catalog_hash_name:
self.logger.info("Found catalog entry {} for image id {}".format(catalog_hash_name, image_id))
else:
- raise vimconn.vimconnNotFoundException("new_vminstance(): Failed create vApp {}: "
+ raise vimconn.VimConnNotFoundException("new_vminstance(): Failed create vApp {}: "
"(Failed retrieve catalog information {})".format(name, image_id))
# Set vCPU and Memory based on flavor.
@@ -1583,7 +1583,7 @@
if flavor_id is not None:
if flavor_id not in vimconnector.flavorlist:
- raise vimconn.vimconnNotFoundException("new_vminstance(): Failed create vApp {}: "
+ raise vimconn.VimConnNotFoundException("new_vminstance(): Failed create vApp {}: "
"Failed retrieve flavor information "
"flavor id {}".format(name, flavor_id))
else:
@@ -1597,7 +1597,7 @@
numas = extended.get("numas", None)
except Exception as exp:
- raise vimconn.vimconnException("Corrupted flavor. {}.Exception: {}".format(flavor_id, exp))
+ raise vimconn.VimConnException("Corrupted flavor. {}.Exception: {}".format(flavor_id, exp))
# image upload creates template name as catalog name space Template.
templateName = self.get_catalogbyid(catalog_uuid=image_id, catalogs=catalogs)
@@ -1628,16 +1628,16 @@
primary_netname = network_dict['name']
except KeyError:
- raise vimconn.vimconnException("Corrupted flavor. {}".format(primary_net))
+ raise vimconn.VimConnException("Corrupted flavor. {}".format(primary_net))
else:
- raise vimconn.vimconnUnexpectedResponse("new_vminstance(): Failed network list is empty.".format(name))
+ raise vimconn.VimConnUnexpectedResponse("new_vminstance(): Failed network list is empty.".format(name))
# use: 'data', 'bridge', 'mgmt'
# create vApp. Set vcpu and ram based on flavor id.
try:
vdc_obj = VDC(self.client, resource=org.get_vdc(self.tenant_name))
if not vdc_obj:
- raise vimconn.vimconnNotFoundException("new_vminstance(): Failed to get VDC object")
+ raise vimconn.VimConnNotFoundException("new_vminstance(): Failed to get VDC object")
for retry in (1, 2):
items = org.get_catalog_item(catalog_hash_name, catalog_hash_name)
@@ -1706,7 +1706,7 @@
"status code : {}".format(instantiate_vapp_href,
response.text,
response.status_code))
- raise vimconn.vimconnException("new_vminstance(): Failed to create"
+ raise vimconn.VimConnException("new_vminstance(): Failed to create"
"vAapp {}".format(vmname_andid))
else:
vapptask = self.get_task_from_response(response.text)
@@ -1718,7 +1718,7 @@
break
if vapptask is None or vapptask is False:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): failed to create vApp {}".format(vmname_andid))
# wait for task to complete
@@ -1727,11 +1727,11 @@
if result.get('status') == 'success':
self.logger.debug("new_vminstance(): Sucessfully created Vapp {}".format(vmname_andid))
else:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): failed to create vApp {}".format(vmname_andid))
except Exception as exp:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): failed to create vApp {} with Exception:{}".format(vmname_andid, exp))
# we should have now vapp in undeployed state.
@@ -1742,12 +1742,12 @@
vapp = VApp(self.client, resource=vapp_resource)
except Exception as exp:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): Failed to retrieve vApp {} after creation: Exception:{}"
.format(vmname_andid, exp))
if vapp_uuid is None:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): Failed to retrieve vApp {} after creation".format(vmname_andid))
# Add PCI passthrough/SRIOV configrations
@@ -1949,7 +1949,7 @@
# it might be a case if specific mandatory entry in dict is empty or some other pyVcloud exception
self.logger.error("new_vminstance(): Failed create new vm instance {} with exception {}"
.format(name, exp))
- raise vimconn.vimconnException("new_vminstance(): Failed create new vm instance {} with exception {}"
+ raise vimconn.VimConnException("new_vminstance(): Failed create new vm instance {} with exception {}"
.format(name, exp))
# check if vApp deployed and if that the case return vApp UUID otherwise -1
wait_time = 0
@@ -1959,7 +1959,7 @@
vapp_resource = vdc_obj.get_vapp(vmname_andid)
vapp = VApp(self.client, resource=vapp_resource)
except Exception as exp:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"new_vminstance(): Failed to retrieve vApp {} after creation: Exception:{}"
.format(vmname_andid, exp))
@@ -1986,7 +1986,7 @@
# Admin access required for creating Affinity rules
client = self.connect_as_admin()
if not client:
- raise vimconn.vimconnConnectionException("Failed to connect vCD as admin")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD as admin")
else:
self.client = client
if self.client:
@@ -2061,7 +2061,7 @@
if vapp_uuid is not None:
return vapp_uuid, None
else:
- raise vimconn.vimconnUnexpectedResponse("new_vminstance(): Failed create new vm instance {}".format(name))
+ raise vimconn.VimConnUnexpectedResponse("new_vminstance(): Failed create new vm instance {}".format(name))
def create_config_drive_iso(self, user_data):
tmpdir = tempfile.mkdtemp()
@@ -2228,7 +2228,7 @@
else:
return availability_zone_list[availability_zone_index]
else:
- raise vimconn.vimconnConflictException("No enough availability zones at VIM for this deployment")
+ raise vimconn.VimConnConflictException("No enough availability zones at VIM for this deployment")
def create_vm_to_host_affinity_rule(self, addrule_href, vmgrpname, hostgrpname, polarity, headers):
""" Method to create VM to Host Affinity rule in vCD
@@ -2270,14 +2270,14 @@
affinity_task = self.get_task_from_response(resp.content)
self.logger.debug("affinity_task: {}".format(affinity_task))
if affinity_task is None or affinity_task is False:
- raise vimconn.vimconnUnexpectedResponse("failed to find affinity task")
+ raise vimconn.VimConnUnexpectedResponse("failed to find affinity task")
# wait for task to complete
result = self.client.get_task_monitor().wait_for_success(task=affinity_task)
if result.get('status') == 'success':
self.logger.debug("Successfully created affinity rule {}".format(rule_name))
return True
else:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"failed to create affinity rule {}".format(rule_name))
def get_add_rule_reference(self, respool_href, headers):
@@ -2404,7 +2404,7 @@
else:
vmgroup_task = self.get_task_from_response(resp.content)
if vmgroup_task is None or vmgroup_task is False:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"create_vmgroup(): failed to create VM group {}".format(vmgroup_name))
# wait for task to complete
@@ -2416,7 +2416,7 @@
vmgroup_status = True
return vmgroup_status
else:
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"create_vmgroup(): failed to create VM group {}".format(vmgroup_name))
def find_vmgroup_reference(self, url, headers):
@@ -2519,7 +2519,7 @@
# Get vdcReferences to find org
pvdc_resp = self.perform_request(req_type='GET', url=pvdc_href, headers=headers)
if pvdc_resp.status_code != requests.codes.ok:
- raise vimconn.vimconnException("REST API call {} failed. "
+ raise vimconn.VimConnException("REST API call {} failed. "
"Return status code {}"
.format(url, pvdc_resp.status_code))
@@ -2534,7 +2534,7 @@
url=vdc_href,
headers=headers)
if vdc_resp.status_code != requests.codes.ok:
- raise vimconn.vimconnException("REST API call {} failed. "
+ raise vimconn.VimConnException("REST API call {} failed. "
"Return status code {}"
.format(url, vdc_resp.status_code))
vdc_resp_xml = XmlElementTree.fromstring(vdc_resp.content)
@@ -2581,7 +2581,7 @@
# get token to connect vCD as a normal user
self.get_token()
self.logger.debug(msg)
- raise vimconn.vimconnException(msg)
+ raise vimconn.VimConnException(msg)
# #
# #
@@ -2605,13 +2605,13 @@
_, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnConnectionException(
+ raise vimconn.VimConnConnectionException(
"Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
vm_info_dict = self.get_vapp_details_rest(vapp_uuid=vim_vm_uuid)
if not vm_info_dict:
self.logger.debug("get_vminstance(): Failed to get vApp name by UUID {}".format(vim_vm_uuid))
- raise vimconn.vimconnNotFoundException("Failed to get vApp name by UUID {}".format(vim_vm_uuid))
+ raise vimconn.VimConnNotFoundException("Failed to get vApp name by UUID {}".format(vim_vm_uuid))
status_key = vm_info_dict['status']
error = ''
@@ -2654,7 +2654,7 @@
if vdc_obj is None:
self.logger.debug("delete_vminstance(): Failed to get a reference of VDC for a tenant {}".format(
self.tenant_name))
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"delete_vminstance(): Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
try:
@@ -2760,7 +2760,7 @@
return vm__vim_uuid
except Exception:
self.logger.debug(traceback.format_exc())
- raise vimconn.vimconnException("delete_vminstance(): Failed delete vm instance {}".format(vm__vim_uuid))
+ raise vimconn.VimConnException("delete_vminstance(): Failed delete vm instance {}".format(vm__vim_uuid))
def refresh_vms_status(self, vm_list):
"""Get the status of the virtual machines and their interfaces/ports
@@ -2790,7 +2790,7 @@
_, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnException("Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
+ raise vimconn.VimConnException("Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
vms_dict = {}
nsx_edge_list = []
@@ -2817,7 +2817,7 @@
"status code : {}".format(vm.get('href'),
response.text,
response.status_code))
- raise vimconn.vimconnException("refresh_vms_status : Failed to get VM details")
+ raise vimconn.VimConnException("refresh_vms_status : Failed to get VM details")
xmlroot = XmlElementTree.fromstring(response.text)
result = response.text.replace("\n", " ")
@@ -2859,7 +2859,7 @@
if not nsx_edge_list:
nsx_edge_list = self.get_edge_details()
if nsx_edge_list is None:
- raise vimconn.vimconnException("refresh_vms_status:"
+ raise vimconn.VimConnException("refresh_vms_status:"
"Failed to get edge details from NSX Manager")
if vm_mac is not None:
vm_ip = self.get_ipaddr_from_NSXedge(nsx_edge_list, vm_mac)
@@ -2906,7 +2906,7 @@
if edge_summary.tag == 'pagingInfo':
for element in edge_summary:
if element.tag == 'totalCount' and element.text == '0':
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"get_edge_details: No NSX edges details found: {}"
.format(self.nsx_manager))
@@ -2915,11 +2915,11 @@
if element.tag == 'id':
edge_list.append(element.text)
else:
- raise vimconn.vimconnException("get_edge_details: No NSX edge details found: {}"
+ raise vimconn.VimConnException("get_edge_details: No NSX edge details found: {}"
.format(self.nsx_manager))
if not edge_list:
- raise vimconn.vimconnException("get_edge_details: "
+ raise vimconn.VimConnException("get_edge_details: "
"No NSX edge details found: {}"
.format(self.nsx_manager))
else:
@@ -2935,7 +2935,7 @@
self.logger.debug("get_edge_details: "
"Failed to get NSX edge details from NSX Manager: {}"
.format(exp))
- raise vimconn.vimconnException("get_edge_details: "
+ raise vimconn.VimConnException("get_edge_details: "
"Failed to get NSX edge details from NSX Manager: {}"
.format(exp))
@@ -2992,16 +2992,16 @@
self.logger.debug("Received action for vm {} and action dict {}".format(vm__vim_uuid, action_dict))
if vm__vim_uuid is None or action_dict is None:
- raise vimconn.vimconnException("Invalid request. VM id or action is None.")
+ raise vimconn.VimConnException("Invalid request. VM id or action is None.")
_, vdc = self.get_vdc_details()
if vdc is None:
- raise vimconn.vimconnException("Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
+ raise vimconn.VimConnException("Failed to get a reference of VDC for a tenant {}".format(self.tenant_name))
vapp_name = self.get_namebyvappid(vm__vim_uuid)
if vapp_name is None:
self.logger.debug("action_vminstance(): Failed to get vm by given {} vm uuid".format(vm__vim_uuid))
- raise vimconn.vimconnException("Failed to get vm by given {} vm uuid".format(vm__vim_uuid))
+ raise vimconn.VimConnException("Failed to get vm by given {} vm uuid".format(vm__vim_uuid))
else:
self.logger.info("Action_vminstance vApp {} and UUID {}".format(vapp_name, vm__vim_uuid))
@@ -3046,12 +3046,12 @@
reboot_task = vapp.reboot()
self.client.get_task_monitor().wait_for_success(task=reboot_task)
else:
- raise vimconn.vimconnException(
+ raise vimconn.VimConnException(
"action_vminstance: Invalid action {} or action is None.".format(action_dict))
return vm__vim_uuid
except Exception as exp:
self.logger.debug("action_vminstance: Failed with Exception {}".format(exp))
- raise vimconn.vimconnException("action_vminstance: Failed with Exception {}".format(exp))
+ raise vimconn.VimConnException("action_vminstance: Failed with Exception {}".format(exp))
def instance_actions_result(self, action, result, vapp_name):
if result.get('status') == 'success':
@@ -3093,7 +3093,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("get_vminstance_console : Failed to get "
+ raise vimconn.VimConnException("get_vminstance_console : Failed to get "
"VM Mks ticket details")
s = re.search("<Host>(.*?)</Host>", response.text)
console_dict['server'] = s.group(1) if s else None
@@ -3116,7 +3116,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("get_vminstance_console : Failed to get "
+ raise vimconn.VimConnException("get_vminstance_console : Failed to get "
"VM console details")
s = re.search(">.*?/(vm-\d+.*)</", response.text)
console_dict['suffix'] = s.group(1) if s else None
@@ -3130,46 +3130,46 @@
"""Transform host dictionary from VIM format to GUI format,
and append to the server_dict
"""
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def get_hosts_info(self):
"""Get the information of deployed hosts
Returns the hosts content"""
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def get_hosts(self, vim_tenant):
"""Get the hosts and deployed instances
Returns the hosts content"""
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def get_processor_rankings(self):
"""Get the processor rankings in the VIM database"""
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def new_host(self, host_data):
"""Adds a new host to VIM"""
'''Returns status code of the VIM response'''
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def new_external_port(self, port_data):
"""Adds a external port to VIM"""
'''Returns the port identifier'''
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def new_external_network(self, net_name, net_type):
"""Adds a external network to VIM (shared)"""
'''Returns the network identifier'''
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def connect_port_network(self, port_id, network_id, admin=False):
"""Connects a external port to a network"""
'''Returns status code of the VIM response'''
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def new_vminstancefromJSON(self, vm_data):
"""Adds a VM instance to VIM"""
'''Returns the instance identifier'''
- raise vimconn.vimconnNotImplemented("Should have implemented this")
+ raise vimconn.VimConnNotImplemented("Should have implemented this")
def get_network_name_by_id(self, network_uuid=None):
"""Method gets vcloud director network named based on supplied uuid.
@@ -3234,7 +3234,7 @@
try:
client_as_admin = self.connect_as_admin()
if not client_as_admin:
- raise vimconn.vimconnConnectionException("Failed to connect vCD.")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD.")
url_list = [self.url, '/api/admin/vdc/', self.tenant_id]
vm_list_rest_call = ''.join(url_list)
@@ -3543,7 +3543,7 @@
vm_dict = {}
vca = self.connect()
if not vca:
- raise vimconn.vimconnConnectionException("self.connect() is failed")
+ raise vimconn.VimConnConnectionException("self.connect() is failed")
if vdc_name is None:
return vm_dict
@@ -3663,7 +3663,7 @@
network_configuration[tagKey] = configuration.text.strip()
except Exception as exp:
self.logger.debug("get_vcd_network: Failed with Exception {}".format(exp))
- raise vimconn.vimconnException("get_vcd_network: Failed with Exception {}".format(exp))
+ raise vimconn.VimConnException("get_vcd_network: Failed with Exception {}".format(exp))
return network_configuration
@@ -3679,7 +3679,7 @@
"""
client = self.connect_as_admin()
if not client:
- raise vimconn.vimconnConnectionException("Failed to connect vCD as admin")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD as admin")
if network_uuid is None:
return False
@@ -3752,7 +3752,7 @@
"""
client_as_admin = self.connect_as_admin()
if not client_as_admin:
- raise vimconn.vimconnConnectionException("Failed to connect vCD.")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD.")
if network_name is None:
return None
@@ -3858,7 +3858,7 @@
dns_address = ip_profile['dns_address']
except KeyError as exp:
self.logger.debug("Create Network REST: Key error {}".format(exp))
- raise vimconn.vimconnException("Create Network REST: Key error{}".format(exp))
+ raise vimconn.VimConnException("Create Network REST: Key error{}".format(exp))
# either use client provided UUID or search for a first available
# if both are not defined we return none
@@ -4039,7 +4039,7 @@
self.logger.info("Creating new vdc {}".format(vdc_name))
vca = self.connect_as_admin()
if not vca:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
if vdc_name is None:
return None
@@ -4114,7 +4114,7 @@
vca = self.connect_as_admin()
if not vca:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
if vdc_name is None:
return None
@@ -4208,7 +4208,7 @@
vca = self.client
if not vca:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
if vapp_uuid is None:
return None
@@ -4545,7 +4545,7 @@
host_obj = new_host_obj
else:
self.logger.info("Fail to migrate VM : {}".format(result))
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Fail to migrate VM : {} to host {}".format(
vmname_andid,
new_host_obj)
@@ -4569,7 +4569,7 @@
no_of_pci_devices,
vmname_andid)
)
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Currently there is no host with {} "
"number of avaialble PCI devices required for VM {}".format(
no_of_pci_devices,
@@ -4807,26 +4807,26 @@
if self.vcenter_ip is not None:
vm_vcenter_info["vm_vcenter_ip"] = self.vcenter_ip
else:
- raise vimconn.vimconnException(message="vCenter IP is not provided."
+ raise vimconn.VimConnException(message="vCenter IP is not provided."
" Please provide vCenter IP while attaching datacenter "
"to tenant in --config")
if self.vcenter_port is not None:
vm_vcenter_info["vm_vcenter_port"] = self.vcenter_port
else:
- raise vimconn.vimconnException(message="vCenter port is not provided."
+ raise vimconn.VimConnException(message="vCenter port is not provided."
" Please provide vCenter port while attaching datacenter "
"to tenant in --config")
if self.vcenter_user is not None:
vm_vcenter_info["vm_vcenter_user"] = self.vcenter_user
else:
- raise vimconn.vimconnException(message="vCenter user is not provided."
+ raise vimconn.VimConnException(message="vCenter user is not provided."
" Please provide vCenter user while attaching datacenter "
"to tenant in --config")
if self.vcenter_password is not None:
vm_vcenter_info["vm_vcenter_password"] = self.vcenter_password
else:
- raise vimconn.vimconnException(message="vCenter user password is not provided."
+ raise vimconn.VimConnException(message="vCenter user password is not provided."
" Please provide vCenter user password while attaching datacenter "
"to tenant in --config")
@@ -4867,7 +4867,7 @@
except Exception as exp:
self.logger.error("Error occurred while getting VM information"
" for VM : {}".format(exp))
- raise vimconn.vimconnException(message=exp)
+ raise vimconn.VimConnException(message=exp)
def reserve_memory_for_all_vms(self, vapp, memory_mb):
"""
@@ -4900,7 +4900,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("reserve_memory_for_all_vms : Failed to get "
+ raise vimconn.VimConnException("reserve_memory_for_all_vms : Failed to get "
"memory")
bytexml = bytes(bytearray(response.text, encoding='utf-8'))
@@ -4929,7 +4929,7 @@
"status code : {} ".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("reserve_memory_for_all_vms : Failed to update "
+ raise vimconn.VimConnException("reserve_memory_for_all_vms : Failed to update "
"virtual hardware memory section")
else:
mem_task = self.get_task_from_response(response.text)
@@ -4969,14 +4969,14 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("connect_vapp_to_org_vdc_network : Failed to get "
+ raise vimconn.VimConnException("connect_vapp_to_org_vdc_network : Failed to get "
"network config section")
data = response.text
headers['Content-Type'] = 'application/vnd.vmware.vcloud.networkConfigSection+xml'
net_id = self.get_network_id_by_name(net_name)
if not net_id:
- raise vimconn.vimconnException("connect_vapp_to_org_vdc_network : Failed to find "
+ raise vimconn.VimConnException("connect_vapp_to_org_vdc_network : Failed to find "
"existing network")
bytexml = bytes(bytearray(data, encoding='utf-8'))
@@ -5021,7 +5021,7 @@
"status code : {} ".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("connect_vapp_to_org_vdc_network : Failed to update "
+ raise vimconn.VimConnException("connect_vapp_to_org_vdc_network : Failed to update "
"network config section")
else:
vapp_task = self.get_task_from_response(response.text)
@@ -5062,7 +5062,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("remove_primary_network_adapter : Failed to get "
+ raise vimconn.VimConnException("remove_primary_network_adapter : Failed to get "
"network connection section")
data = response.text
@@ -5101,7 +5101,7 @@
"status code : {} ".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("remove_primary_network_adapter : Failed to update "
+ raise vimconn.VimConnException("remove_primary_network_adapter : Failed to update "
"network connection section")
else:
nic_task = self.get_task_from_response(response.text)
@@ -5168,7 +5168,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("add_network_adapter_to_vms : Failed to get "
+ raise vimconn.VimConnException("add_network_adapter_to_vms : Failed to get "
"network connection section")
data = response.text
@@ -5230,7 +5230,7 @@
"status code : {} ".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("add_network_adapter_to_vms : Failed to update "
+ raise vimconn.VimConnException("add_network_adapter_to_vms : Failed to update "
"network connection section")
else:
nic_task = self.get_task_from_response(response.text)
@@ -5261,7 +5261,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("add_network_adapter_to_vms : Failed to get "
+ raise vimconn.VimConnException("add_network_adapter_to_vms : Failed to get "
"network connection section")
data = response.text
data = data.split('<Link rel="edit"')[0]
@@ -5328,7 +5328,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("add_network_adapter_to_vms : Failed to update "
+ raise vimconn.VimConnException("add_network_adapter_to_vms : Failed to update "
"network connection section")
else:
nic_task = self.get_task_from_response(response.text)
@@ -5342,7 +5342,7 @@
except Exception as exp:
self.logger.error("add_network_adapter_to_vms() : exception occurred "
"while adding Network adapter")
- raise vimconn.vimconnException(message=exp)
+ raise vimconn.VimConnException(message=exp)
def set_numa_affinity(self, vmuuid, paired_threads_id):
"""
@@ -5383,7 +5383,7 @@
except Exception as exp:
self.logger.error("set_numa_affinity : exception occurred while setting numa affinity "
"for VM {} : {}".format(vm_obj, vm_moref_id))
- raise vimconn.vimconnException("set_numa_affinity : Error {} failed to assign numa "
+ raise vimconn.VimConnException("set_numa_affinity : Error {} failed to assign numa "
"affinity".format(exp))
def cloud_init(self, vapp, cloud_config):
@@ -5426,7 +5426,7 @@
except Exception as exp:
self.logger.error("cloud_init : exception occurred while injecting "
"ssh-key")
- raise vimconn.vimconnException("cloud_init : Error {} failed to inject "
+ raise vimconn.VimConnException("cloud_init : Error {} failed to inject "
"ssh-key".format(exp))
def format_script(self, key_pairs=[], users_list=[]):
@@ -5545,7 +5545,7 @@
else:
self.logger.error("guest_customization : task for customized guest os"
"failed for VM {}".format(vm_name))
- raise vimconn.vimconnException("guest_customization : failed to perform"
+ raise vimconn.VimConnException("guest_customization : failed to perform"
"guest os customization on VM {}".format(vm_name))
def add_new_disk(self, vapp_uuid, disk_size):
@@ -5828,7 +5828,7 @@
except Exception as exp:
self.logger.error("Error occurred while getting vCenter infromationn"
" for VM : {}".format(exp))
- raise vimconn.vimconnException(message=exp)
+ raise vimconn.VimConnException(message=exp)
context = None
if hasattr(ssl, '_create_unverified_context'):
@@ -5875,7 +5875,7 @@
vca = self.connect_as_admin()
if not vca:
- raise vimconn.vimconnConnectionException("Failed to connect vCD")
+ raise vimconn.VimConnConnectionException("Failed to connect vCD")
try:
org, _ = self.get_vdc_details()
@@ -5950,9 +5950,9 @@
msg = "No vApp ID"
self.logger.error(msg)
if exp_type == "Genric":
- raise vimconn.vimconnException(msg)
+ raise vimconn.VimConnException(msg)
elif exp_type == "NotFound":
- raise vimconn.vimconnNotFoundException(message=msg)
+ raise vimconn.VimConnNotFoundException(message=msg)
def add_sriov(self, vapp_uuid, sriov_nets, vmname_andid):
"""
@@ -6002,7 +6002,7 @@
host_obj = new_host_obj
else:
self.logger.info("Fail to migrate VM : {}".format(result))
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Fail to migrate VM : {} to host {}".format(
vmname_andid,
new_host_obj)
@@ -6035,7 +6035,7 @@
self.logger.error("Fail to add SRIOV {} to VM {}".format(
no_of_sriov_devices,
str(vm_obj)))
- raise vimconn.vimconnUnexpectedResponse(
+ raise vimconn.VimConnUnexpectedResponse(
"Fail to add SRIOV adapter in VM ".format(str(vm_obj))
)
return True, vm_obj, vcenter_conect
@@ -6046,7 +6046,7 @@
no_of_sriov_devices,
vmname_andid)
)
- raise vimconn.vimconnNotFoundException(
+ raise vimconn.VimConnNotFoundException(
"Currently there is no host with {} "
"number of avaialble SRIOV devices required for VM {}".format(
no_of_sriov_devices,
@@ -6332,7 +6332,7 @@
vlan_id = None
used_ids = []
if self.config.get('vlanID_range') is None:
- raise vimconn.vimconnConflictException("You must provide a 'vlanID_range' "
+ raise vimconn.VimConnConflictException("You must provide a 'vlanID_range' "
"at config value before creating sriov network with vlan tag")
if "used_vlanIDs" not in self.persistent_info:
self.persistent_info["used_vlanIDs"] = {}
@@ -6342,7 +6342,7 @@
for vlanID_range in self.config.get('vlanID_range'):
start_vlanid, end_vlanid = vlanID_range.split("-")
if start_vlanid > end_vlanid:
- raise vimconn.vimconnConflictException("Invalid vlan ID range {}".format(
+ raise vimconn.VimConnConflictException("Invalid vlan ID range {}".format(
vlanID_range))
for vid in range(int(start_vlanid), int(end_vlanid) + 1):
@@ -6351,7 +6351,7 @@
self.persistent_info["used_vlanIDs"][network_name] = vlan_id
return vlan_id
if vlan_id is None:
- raise vimconn.vimconnConflictException("All Vlan IDs are in use")
+ raise vimconn.VimConnConflictException("All Vlan IDs are in use")
def get_obj(self, content, vimtype, name):
"""
@@ -6388,7 +6388,7 @@
"status code : {}".format(url_rest_call,
response.text,
response.status_code))
- raise vimconn.vimconnException("insert_media_to_vm(): Failed to get "
+ raise vimconn.VimConnException("insert_media_to_vm(): Failed to get "
"catalog details")
# searching iso name and id
iso_name, media_id = self.get_media_details(vca, response.text)
@@ -6427,7 +6427,7 @@
error_msg = ("insert_media_to_vm() : Failed to insert CD-ROM to vm. Reason {}. "
"Status code {}".format(response.text, response.status_code))
self.logger.error(error_msg)
- raise vimconn.vimconnException(error_msg)
+ raise vimconn.VimConnException(error_msg)
else:
task = self.get_task_from_response(response.text)
result = self.client.get_task_monitor().wait_for_success(task=task)
@@ -6438,7 +6438,7 @@
except Exception as exp:
self.logger.error("insert_media_to_vm() : exception occurred "
"while inserting media CD-ROM")
- raise vimconn.vimconnException(message=exp)
+ raise vimconn.VimConnException(message=exp)
def get_media_details(self, vca, content):
"""
@@ -6467,7 +6467,7 @@
"status code : {}".format(href,
response.text,
response.status_code))
- raise vimconn.vimconnException("get_media_details : Failed to get "
+ raise vimconn.VimConnException("get_media_details : Failed to get "
"catalogitem details")
list_xmlroot = XmlElementTree.fromstring(response.text)
for child in list_xmlroot.iter():
@@ -6482,7 +6482,7 @@
except Exception as exp:
self.logger.error("get_media_details : exception occurred "
"getting media details")
- raise vimconn.vimconnException(message=exp)
+ raise vimconn.VimConnException(message=exp)
def retry_rest(self, method, url, add_headers=None, data=None):
""" Method to get Token & retry respective REST request
@@ -6640,7 +6640,7 @@
"status code : {} ".format(poweron_href,
response.text,
response.status_code))
- raise vimconn.vimconnException("power_on_vapp() : Failed to power on "
+ raise vimconn.VimConnException("power_on_vapp() : Failed to power on "
"vApp {}".format(vapp_name))
else:
poweron_task = self.get_task_from_response(response.text)
diff --git a/RO-VIM-vmware/requirements.txt b/RO-VIM-vmware/requirements.txt
index 05a3ec1..1657367 100644
--- a/RO-VIM-vmware/requirements.txt
+++ b/RO-VIM-vmware/requirements.txt
@@ -22,4 +22,4 @@
progressbar
prettytable
# TODO py3 genisoimage
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-vmware/setup.py b/RO-VIM-vmware/setup.py
index 373cf81..46594a6 100644
--- a/RO-VIM-vmware/setup.py
+++ b/RO-VIM-vmware/setup.py
@@ -37,9 +37,9 @@
# version=VERSION,
# python_requires='>3.5.0',
author='ETSI OSM',
- # TODO py3 author_email='',
- maintainer='OSM_TECH@LIST.ETSI.ORG', # TODO py3
- # TODO py3 maintainer_email='',
+ author_email='OSM_TECH@LIST.ETSI.ORG',
+ maintainer='ETSI OSM',
+ maintainer_email='OSM_TECH@LIST.ETSI.ORG',
url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
license='Apache 2.0',
@@ -48,10 +48,10 @@
install_requires=[
"pyvcloud==19.1.1", "progressbar", "prettytable", "pyvmomi",
"requests", "netaddr", "PyYAML",
- "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+ "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin"
],
setup_requires=['setuptools-version-command'],
entry_points={
- 'osm_rovim.plugins': ['rovim_vmware = osm_rovim_vmware.vimconn_vmware'],
+ 'osm_rovim.plugins': ['rovim_vmware = osm_rovim_vmware.vimconn_vmware:vimconnector'],
},
)
diff --git a/RO-VIM-vmware/stdeb.cfg b/RO-VIM-vmware/stdeb.cfg
index ff50a2f..58ac4b9 100644
--- a/RO-VIM-vmware/stdeb.cfg
+++ b/RO-VIM-vmware/stdeb.cfg
@@ -16,5 +16,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro, python3-pip,
+Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip,
genisoimage, python3-progressbar, python3-prettytable, python3-pyvmomi
diff --git a/RO-client/stdeb.cfg b/RO-client/stdeb.cfg
index 844e87e..94477fb 100644
--- a/RO-client/stdeb.cfg
+++ b/RO-client/stdeb.cfg
@@ -15,4 +15,5 @@
[DEFAULT]
X-Python3-Version : >= 3.5
-Depends3: python3-argcomplete, python3-requests, python3-yaml
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-argcomplete, python3-requests, python3-yaml
diff --git a/RO-plugin/Makefile b/RO-plugin/Makefile
new file mode 100644
index 0000000..3522b72
--- /dev/null
+++ b/RO-plugin/Makefile
@@ -0,0 +1,24 @@
+##
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+all: clean package
+
+clean:
+ rm -rf dist deb_dist osm_ro_plugin-*.tar.gz osm_ro_plugin.egg-info .eggs
+
+package:
+ python3 setup.py --command-packages=stdeb.command sdist_dsc
+ cd deb_dist/osm-ro-plugin*/ && dpkg-buildpackage -rfakeroot -uc -us
+
diff --git a/RO/osm_ro/wim/openflow_conn.py b/RO-plugin/osm_ro_plugin/openflow_conn.py
similarity index 99%
rename from RO/osm_ro/wim/openflow_conn.py
rename to RO-plugin/osm_ro_plugin/openflow_conn.py
index c7195bd..f7910c9 100644
--- a/RO/osm_ro/wim/openflow_conn.py
+++ b/RO-plugin/osm_ro_plugin/openflow_conn.py
@@ -17,7 +17,7 @@
##
import logging
from http import HTTPStatus
-from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
from uuid import uuid4
"""
diff --git a/RO/osm_ro/wim/wimconn_dummy.py b/RO-plugin/osm_ro_plugin/sdn_dummy.py
similarity index 96%
rename from RO/osm_ro/wim/wimconn_dummy.py
rename to RO-plugin/osm_ro_plugin/sdn_dummy.py
index 3e15b64..619a679 100644
--- a/RO/osm_ro/wim/wimconn_dummy.py
+++ b/RO-plugin/osm_ro_plugin/sdn_dummy.py
@@ -22,12 +22,12 @@
import logging
from uuid import uuid4
-from .sdnconn import SdnConnectorBase, SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
from http import HTTPStatus
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
-class DummyConnector(SdnConnectorBase):
+class SdnDummyConnector(SdnConnectorBase):
"""Abstract base class for all the WIM connectors
Arguments:
@@ -45,7 +45,7 @@
"""
def __init__(self, wim, wim_account, config=None, logger=None):
self.logger = logger or logging.getLogger('openmano.sdnconn.dummy')
- super(DummyConnector, self).__init__(wim, wim_account, config, self.logger)
+ super(SdnDummyConnector, self).__init__(wim, wim_account, config, self.logger)
self.logger.debug("__init: wim='{}' wim_account='{}'".format(wim, wim_account))
self.connections = {}
self.counter = 0
diff --git a/RO/osm_ro/wim/failing_connector.py b/RO-plugin/osm_ro_plugin/sdn_failing.py
similarity index 96%
rename from RO/osm_ro/wim/failing_connector.py
rename to RO-plugin/osm_ro_plugin/sdn_failing.py
index 6bbab35..b8ea42f 100644
--- a/RO/osm_ro/wim/failing_connector.py
+++ b/RO-plugin/osm_ro_plugin/sdn_failing.py
@@ -37,10 +37,10 @@
execute any action
"""
import json
-from .sdnconn import SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorError
-class FailingConnector(object):
+class SdnFailingConnector(object):
"""Placeholder for a connector whose incitation failed,
This place holder will just raise an error every time an action is needed
from the connector.
diff --git a/RO/osm_ro/wim/sdnconn.py b/RO-plugin/osm_ro_plugin/sdnconn.py
similarity index 97%
rename from RO/osm_ro/wim/sdnconn.py
rename to RO-plugin/osm_ro_plugin/sdnconn.py
index f24cedc..b7b1faa 100644
--- a/RO/osm_ro/wim/sdnconn.py
+++ b/RO-plugin/osm_ro_plugin/sdnconn.py
@@ -37,11 +37,10 @@
It receives information from ports to be connected .
"""
import logging
-
-from ..http_tools.errors import HttpMappedError
+from http import HTTPStatus
-class SdnConnectorError(HttpMappedError):
+class SdnConnectorError(Exception):
"""Base Exception for all connector related errors
provide the parameter 'http_code' (int) with the error code:
Bad_Request = 400
@@ -55,6 +54,9 @@
Service_Unavailable = 503
Internal_Server_Error = 500
"""
+ def __init__(self, message, http_code=HTTPStatus.INTERNAL_SERVER_ERROR.value):
+ Exception.__init__(self, message)
+ self.http_code = http_code
class SdnConnectorBase(object):
diff --git a/RO/osm_ro/vim_dummy.py b/RO-plugin/osm_ro_plugin/vim_dummy.py
similarity index 93%
rename from RO/osm_ro/vim_dummy.py
rename to RO-plugin/osm_ro_plugin/vim_dummy.py
index 9636377..8154304 100644
--- a/RO/osm_ro/vim_dummy.py
+++ b/RO-plugin/osm_ro_plugin/vim_dummy.py
@@ -21,7 +21,7 @@
"""
import yaml
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
from uuid import uuid4
from copy import deepcopy
@@ -29,7 +29,7 @@
__date__ = "2020-04-20"
-class vimconnector(vimconn.vimconnector):
+class VimDummyConnector(vimconn.VimConnector):
"""Dummy vim connector that does nothing
Provide config with:
vm_ip: ip address to provide at VM creation. For some tests must be a valid reachable VM
@@ -114,12 +114,12 @@
def get_network(self, net_id):
if net_id not in self.nets:
- raise vimconn.vimconnNotFoundException("network with id {} not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("network with id {} not found".format(net_id))
return self.nets[net_id]
def delete_network(self, net_id, created_items=None):
if net_id not in self.nets:
- raise vimconn.vimconnNotFoundException("network with id {} not found".format(net_id))
+ raise vimconn.VimConnNotFoundException("network with id {} not found".format(net_id))
return net_id
self.nets.pop(net_id)
@@ -138,7 +138,7 @@
def get_flavor(self, flavor_id):
if flavor_id not in self.flavors:
- raise vimconn.vimconnNotFoundException("flavor with id {} not found".format(flavor_id))
+ raise vimconn.VimConnNotFoundException("flavor with id {} not found".format(flavor_id))
return self.flavors[flavor_id]
def new_flavor(self, flavor_data):
@@ -152,7 +152,7 @@
def delete_flavor(self, flavor_id):
if flavor_id not in self.flavors:
- raise vimconn.vimconnNotFoundException("flavor with id {} not found".format(flavor_id))
+ raise vimconn.VimConnNotFoundException("flavor with id {} not found".format(flavor_id))
return flavor_id
self.flavors.pop(flavor_id)
@@ -163,7 +163,7 @@
break
else:
return flavor_id
- raise vimconn.vimconnNotFoundException("flavor with ram={} cpu={} disk={} {} not found".format(
+ raise vimconn.VimConnNotFoundException("flavor with ram={} cpu={} disk={} {} not found".format(
flavor_dict["ram"], flavor_dict["vcpus"], flavor_dict["disk"],
"and extended" if flavor_dict.get("extended") else ""))
@@ -175,7 +175,7 @@
def delete_tenant(self, tenant_id):
if tenant_id not in self.tenants:
- raise vimconn.vimconnNotFoundException("tenant with id {} not found".format(tenant_id))
+ raise vimconn.VimConnNotFoundException("tenant with id {} not found".format(tenant_id))
return tenant_id
self.tenants.pop(tenant_id)
@@ -202,7 +202,7 @@
def delete_image(self, image_id):
if image_id not in self.images:
- raise vimconn.vimconnNotFoundException("image with id {} not found".format(image_id))
+ raise vimconn.VimConnNotFoundException("image with id {} not found".format(image_id))
return image_id
self.images.pop(image_id)
@@ -251,12 +251,12 @@
def get_vminstance(self, vm_id):
if vm_id not in self.vms:
- raise vimconn.vimconnNotFoundException("vm with id {} not found".format(vm_id))
+ raise vimconn.VimConnNotFoundException("vm with id {} not found".format(vm_id))
return self.vms[vm_id]
def delete_vminstance(self, vm_id, created_items=None):
if vm_id not in self.vms:
- raise vimconn.vimconnNotFoundException("vm with id {} not found".format(vm_id))
+ raise vimconn.VimConnNotFoundException("vm with id {} not found".format(vm_id))
return vm_id
self.vms.pop(vm_id)
diff --git a/RO/osm_ro/vimconn.py b/RO-plugin/osm_ro_plugin/vimconn.py
similarity index 85%
rename from RO/osm_ro/vimconn.py
rename to RO-plugin/osm_ro_plugin/vimconn.py
index 2cef7ef..dd60e46 100644
--- a/RO/osm_ro/vimconn.py
+++ b/RO-plugin/osm_ro_plugin/vimconn.py
@@ -34,75 +34,89 @@
import sys
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
-from osm_ro.utils import deprecated
+from http import HTTPStatus
+import warnings
__author__ = "Alfonso Tierno, Igor D.C."
-__date__ = "$14-aug-2017 23:59:59$"
-
-#Error variables
-HTTP_Bad_Request = 400
-HTTP_Unauthorized = 401
-HTTP_Not_Found = 404
-HTTP_Method_Not_Allowed = 405
-HTTP_Request_Timeout = 408
-HTTP_Conflict = 409
-HTTP_Not_Implemented = 501
-HTTP_Service_Unavailable = 503
-HTTP_Internal_Server_Error = 500
+__date__ = "$14-aug-2017 23:59:59$"
-class vimconnException(Exception):
- """Common and base class Exception for all vimconnector exceptions"""
+def deprecated(message):
+ def deprecated_decorator(func):
+ def deprecated_func(*args, **kwargs):
+ warnings.warn("{} is a deprecated function. {}".format(func.__name__, message),
+ category=DeprecationWarning,
+ stacklevel=2)
+ warnings.simplefilter('default', DeprecationWarning)
+ return func(*args, **kwargs)
+ return deprecated_func
+ return deprecated_decorator
+
+
+# Error variables
+HTTP_Bad_Request = HTTPStatus.BAD_REQUEST.value
+HTTP_Unauthorized = HTTPStatus.UNAUTHORIZED.value
+HTTP_Not_Found = HTTPStatus.NOT_FOUND.value
+HTTP_Method_Not_Allowed = HTTPStatus.METHOD_NOT_ALLOWED.value
+HTTP_Request_Timeout = HTTPStatus.REQUEST_TIMEOUT.value
+HTTP_Conflict = HTTPStatus.CONFLICT.value
+HTTP_Not_Implemented = HTTPStatus.NOT_IMPLEMENTED.value
+HTTP_Service_Unavailable = HTTPStatus.SERVICE_UNAVAILABLE.value
+HTTP_Internal_Server_Error = HTTPStatus.INTERNAL_SERVER_ERROR.value
+
+
+class VimConnException(Exception):
+ """Common and base class Exception for all VimConnector exceptions"""
def __init__(self, message, http_code=HTTP_Bad_Request):
Exception.__init__(self, message)
self.http_code = http_code
-class vimconnConnectionException(vimconnException):
+class VimConnConnectionException(VimConnException):
"""Connectivity error with the VIM"""
def __init__(self, message, http_code=HTTP_Service_Unavailable):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnUnexpectedResponse(vimconnException):
+class VimConnUnexpectedResponse(VimConnException):
"""Get an wrong response from VIM"""
def __init__(self, message, http_code=HTTP_Service_Unavailable):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnAuthException(vimconnException):
+class VimConnAuthException(VimConnException):
"""Invalid credentials or authorization to perform this action over the VIM"""
def __init__(self, message, http_code=HTTP_Unauthorized):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnNotFoundException(vimconnException):
+class VimConnNotFoundException(VimConnException):
"""The item is not found at VIM"""
def __init__(self, message, http_code=HTTP_Not_Found):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnConflictException(vimconnException):
+class VimConnConflictException(VimConnException):
"""There is a conflict, e.g. more item found than one"""
def __init__(self, message, http_code=HTTP_Conflict):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnNotSupportedException(vimconnException):
+class VimConnNotSupportedException(VimConnException):
"""The request is not supported by connector"""
def __init__(self, message, http_code=HTTP_Service_Unavailable):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnNotImplemented(vimconnException):
+class VimConnNotImplemented(VimConnException):
"""The method is not implemented by the connected"""
def __init__(self, message, http_code=HTTP_Not_Implemented):
- vimconnException.__init__(self, message, http_code)
+ VimConnException.__init__(self, message, http_code)
-class vimconnector():
+class VimConnector():
"""Abstract base class for all the VIM connector plugins
- These plugins must implement a vimconnector class derived from this
+ These plugins must implement a VimConnector class derived from this
and all these privated methods
"""
def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level=None,
@@ -295,26 +309,11 @@
def check_vim_connectivity(self):
"""Checks VIM can be reached and user credentials are ok.
- Returns None if success or raises vimconnConnectionException, vimconnAuthException, ...
+ Returns None if success or raises VimConnConnectionException, VimConnAuthException, ...
"""
# by default no checking until each connector implements it
return None
- def new_tenant(self, tenant_name, tenant_description):
- """Adds a new tenant to VIM with this name and description, this is done using admin_url if provided
- "tenant_name": string max lenght 64
- "tenant_description": string max length 256
- returns the tenant identifier or raise exception
- """
- raise vimconnNotImplemented("Should have implemented this")
-
- def delete_tenant(self, tenant_id):
- """Delete a tenant from VIM
- tenant_id: returned VIM tenant_id on "new_tenant"
- Returns None on success. Raises and exception of failure. If tenant is not found raises vimconnNotFoundException
- """
- raise vimconnNotImplemented("Should have implemented this")
-
def get_tenant_list(self, filter_dict={}):
"""Obtain tenants of VIM
filter_dict dictionary that can contain the following keys:
@@ -324,7 +323,7 @@
Returns the tenant list of dictionaries, and empty list if no tenant match all the filers:
[{'name':'<name>, 'id':'<id>, ...}, ...]
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def new_network(self, net_name, net_type, ip_profile=None, shared=False, provider_network_profile=None):
"""Adds a tenant network to VIM
@@ -347,10 +346,10 @@
Returns a tuple with the network identifier and created_items, or raises an exception on error
created_items can be None or a dictionary where this method can include key-values that will be passed to
the method delete_network. Can be used to store created segments, created l2gw connections, etc.
- Format is vimconnector dependent, but do not use nested dictionaries and a value of None should be the same
+ Format is VimConnector dependent, but do not use nested dictionaries and a value of None should be the same
as not present.
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_network_list(self, filter_dict={}):
"""Obtain tenant networks of VIM
@@ -360,7 +359,8 @@
id: string => returns networks with this VIM id, this imply returns one network at most
shared: boolean >= returns only networks that are (or are not) shared
tenant_id: sting => returns only networks that belong to this tenant/project
- ,#(not used yet) admin_state_up: boolean => returns only networks that are (or are not) in admin state active
+ ,#(not used yet) admin_state_up: boolean => returns only networks that are (or are not) in admin state
+ active
#(not used yet) status: 'ACTIVE','ERROR',... => filter networks that are on this status
Returns the network list of dictionaries. each dictionary contains:
'id': (mandatory) VIM network id
@@ -373,7 +373,7 @@
List can be empty if no network map the filter_dict. Raise an exception only upon VIM connectivity,
authorization, or some other unspecific error
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_network(self, net_id):
"""Obtain network details from the 'net_id' VIM network
@@ -385,7 +385,7 @@
other VIM specific fields: (optional) whenever possible using the same naming of filter_dict param
Raises an exception upon error or when network is not found
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def delete_network(self, net_id, created_items=None):
"""
@@ -394,7 +394,7 @@
:param created_items: dictionary with extra items to be deleted. provided by method new_network
Returns the network identifier or raises an exception upon error or when network is not found
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def refresh_nets_status(self, net_list):
"""Get the status of the networks
@@ -413,14 +413,14 @@
vim_info: #Text with plain information obtained from vim (yaml.safe_dump)
'net_id2': ...
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_flavor(self, flavor_id):
"""Obtain flavor details from the VIM
Returns the flavor dict details {'id':<>, 'name':<>, other vim specific }
Raises an exception upon error or if not found
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_flavor_id_from_data(self, flavor_dict):
"""Obtain flavor id that match the flavor description
@@ -430,9 +430,9 @@
'ram': meomry in MB
'vcpus': number of virtual cpus
#TODO: complete parameters for EPA
- Returns the flavor_id or raises a vimconnNotFoundException
+ Returns the flavor_id or raises a VimConnNotFoundException
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def new_flavor(self, flavor_data):
"""Adds a tenant flavor to VIM
@@ -443,7 +443,8 @@
extended: EPA parameters
- numas: #items requested in same NUMA
memory: number of 1G huge pages memory
- paired-threads|cores|threads: number of paired hyperthreads, complete cores OR individual threads
+ paired-threads|cores|threads: number of paired hyperthreads, complete cores OR individual
+ threads
interfaces: # passthrough(PT) or SRIOV interfaces attached to this numa
- name: interface name
dedicated: yes|no|yes:sriov; for PT, SRIOV or only one SRIOV for the physical NIC
@@ -453,29 +454,29 @@
is_public:
#TODO to concrete
Returns the flavor identifier"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def delete_flavor(self, flavor_id):
"""Deletes a tenant flavor from VIM identify by its id
Returns the used id or raise an exception"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def new_image(self, image_dict):
""" Adds a tenant image to VIM
Returns the image id or raises an exception if failed
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def delete_image(self, image_id):
"""Deletes a tenant image from VIM
Returns the image_id if image is deleted or raises an exception on error"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_image_id_from_path(self, path):
"""Get the image id from image path in the VIM database.
- Returns the image_id or raises a vimconnNotFoundException
+ Returns the image_id or raises a VimConnNotFoundException
"""
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def get_image_list(self, filter_dict={}):
"""Obtain tenant images from VIM
@@ -488,10 +489,10 @@
[{<the fields at Filter_dict plus some VIM specific>}, ...]
List can be empty
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None,
- availability_zone_index=None, availability_zone_list=None):
+ availability_zone_index=None, availability_zone_list=None):
"""Adds a VM instance to VIM
Params:
'start': (boolean) indicates if VM must start or created in pause mode.
@@ -499,15 +500,18 @@
'net_list': list of interfaces, each one is a dictionary with:
'name': (optional) name for the interface.
'net_id': VIM network id where this interface must be connect to. Mandatory for type==virtual
- 'vpci': (optional) virtual vPCI address to assign at the VM. Can be ignored depending on VIM capabilities
+ 'vpci': (optional) virtual vPCI address to assign at the VM. Can be ignored depending on VIM
+ capabilities
'model': (optional and only have sense for type==virtual) interface model: virtio, e1000, ...
'mac_address': (optional) mac address to assign to this interface
'ip_address': (optional) IP address to assign to this interface
- #TODO: CHECK if an optional 'vlan' parameter is needed for VIMs when type if VF and net_id is not provided,
- the VLAN tag to be used. In case net_id is provided, the internal network vlan is used for tagging VF
+ #TODO: CHECK if an optional 'vlan' parameter is needed for VIMs when type if VF and net_id is not
+ provided, the VLAN tag to be used. In case net_id is provided, the internal network vlan is used
+ for tagging VF
'type': (mandatory) can be one of:
'virtual', in this case always connected to a network of type 'net_type=bridge'
- 'PCI-PASSTHROUGH' or 'PF' (passthrough): depending on VIM capabilities it can be connected to a data/ptp network ot it
+ 'PCI-PASSTHROUGH' or 'PF' (passthrough): depending on VIM capabilities it can be connected to a
+ data/ptp network ot it
can created unconnected
'SR-IOV' or 'VF' (SRIOV with VLAN tag): same as PF for network connectivity.
'VFnotShared'(SRIOV without VLAN tag) same as PF for network connectivity. VF where no other VFs
@@ -542,14 +546,14 @@
Returns a tuple with the instance identifier and created_items or raises an exception on error
created_items can be None or a dictionary where this method can include key-values that will be passed to
the method delete_vminstance and action_vminstance. Can be used to store created ports, volumes, etc.
- Format is vimconnector dependent, but do not use nested dictionaries and a value of None should be the same
+ Format is VimConnector dependent, but do not use nested dictionaries and a value of None should be the same
as not present.
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
- def get_vminstance(self,vm_id):
+ def get_vminstance(self, vm_id):
"""Returns the VM instance information from VIM"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def delete_vminstance(self, vm_id, created_items=None):
"""
@@ -559,7 +563,7 @@
action_vminstance
:return: None or the same vm_id. Raises an exception on fail
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def refresh_vms_status(self, vm_list):
"""Get the status of the virtual machines and their interfaces/ports
@@ -587,7 +591,7 @@
pci: #PCI address of the NIC that hosts the PF,VF
vlan: #physical VLAN used for VF
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def action_vminstance(self, vm_id, action_dict, created_items={}):
"""
@@ -596,12 +600,12 @@
:param vm_id: VIM identifier of the VM, provided by method new_vminstance
:param action_dict: dictionary with the action to perform
:param created_items: provided by method new_vminstance is a dictionary with key-values that will be passed to
- the method delete_vminstance. Can be used to store created ports, volumes, etc. Format is vimconnector
+ the method delete_vminstance. Can be used to store created ports, volumes, etc. Format is VimConnector
dependent, but do not use nested dictionaries and a value of None should be the same as not present. This
method can modify this value
:return: None, or a console dict
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def get_vminstance_console(self, vm_id, console_type="vnc"):
"""
@@ -617,7 +621,7 @@
port: the http, ssh, ... port
suffix: extra text, e.g. the http path and query string
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def inject_user_key(self, ip_addr=None, user=None, key=None, ro_key=None, password=None):
"""
@@ -631,9 +635,9 @@
The function doesn't return a value:
"""
if not ip_addr or not user:
- raise vimconnNotSupportedException("All parameters should be different from 'None'")
+ raise VimConnNotSupportedException("All parameters should be different from 'None'")
elif not ro_key and not password:
- raise vimconnNotSupportedException("All parameters should be different from 'None'")
+ raise VimConnNotSupportedException("All parameters should be different from 'None'")
else:
commands = {'mkdir -p ~/.ssh/', 'echo "{}" >> ~/.ssh/authorized_keys'.format(key),
'chmod 644 ~/.ssh/authorized_keys', 'chmod 700 ~/.ssh/'}
@@ -648,44 +652,32 @@
for command in commands:
(i, o, e) = client.exec_command(command, timeout=10)
returncode = o.channel.recv_exit_status()
- output = o.read()
outerror = e.read()
if returncode != 0:
text = "run_command='{}' Error='{}'".format(command, outerror)
- raise vimconnUnexpectedResponse("Cannot inject ssh key in VM: '{}'".format(text))
+ raise VimConnUnexpectedResponse("Cannot inject ssh key in VM: '{}'".format(text))
return
except (socket.error, paramiko.AuthenticationException, paramiko.SSHException) as message:
- raise vimconnUnexpectedResponse(
+ raise VimConnUnexpectedResponse(
"Cannot inject ssh key in VM: '{}' - {}".format(ip_addr, str(message)))
return
# Optional methods
- def new_tenant(self,tenant_name,tenant_description):
+ def new_tenant(self, tenant_name, tenant_description):
"""Adds a new tenant to VIM with this name and description, this is done using admin_url if provided
"tenant_name": string max lenght 64
"tenant_description": string max length 256
returns the tenant identifier or raise exception
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
- def delete_tenant(self,tenant_id,):
+ def delete_tenant(self, tenant_id,):
"""Delete a tenant from VIM
tenant_id: returned VIM tenant_id on "new_tenant"
- Returns None on success. Raises and exception of failure. If tenant is not found raises vimconnNotFoundException
+ Returns None on success. Raises and exception of failure. If tenant is not found raises VimConnNotFoundException
"""
- raise vimconnNotImplemented( "Should have implemented this" )
-
- def get_tenant_list(self, filter_dict=None):
- """Obtain tenants of VIM
- filter_dict dictionary that can contain the following keys:
- name: filter by tenant name
- id: filter by tenant uuid/id
- <other VIM specific>
- Returns the tenant list of dictionaries, and empty list if no tenant match all the filers:
- [{'name':'<name>, 'id':'<id>, ...}, ...]
- """
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
def new_classification(self, name, ctype, definition):
"""Creates a traffic classification in the VIM
@@ -695,7 +687,7 @@
'definition': definition of this classification (type-dependent free-form text)
Returns the VIM's classification ID on success or raises an exception on failure
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_classification(self, classification_id):
"""Obtain classification details of the VIM's classification with ID='classification_id'
@@ -709,13 +701,15 @@
other VIM specific fields: (optional) whenever possible
Raises an exception upon error or when classification is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_classification_list(self, filter_dict={}):
"""Obtain classifications from the VIM
Params:
- 'filter_dict' (optional): contains the entries to filter the classifications on and only return those that match ALL:
- id: string => returns classifications with this VIM's classification ID, which implies a return of one classification at most
+ 'filter_dict' (optional): contains the entries to filter the classifications on and only return those that
+ match ALL:
+ id: string => returns classifications with this VIM's classification ID, which implies a return of one
+ classification at most
name: string => returns only classifications with this name
type: string => returns classifications of this type
definition: string => returns classifications that have this definition
@@ -729,7 +723,7 @@
List can be empty if no classification matches the filter_dict. Raise an exception only upon VIM connectivity,
authorization, or some other unspecific error
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def refresh_classifications_status(self, classification_list):
'''Get the status of the classifications
@@ -746,13 +740,14 @@
error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR
vim_info: #Text with plain information obtained from vim (yaml.safe_dump)
'''
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def delete_classification(self, classification_id):
"""Deletes a classification from the VIM
- Returns the classification ID (classification_id) or raises an exception upon error or when classification is not found
+ Returns the classification ID (classification_id) or raises an exception upon error or when classification is
+ not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def new_sfi(self, name, ingress_ports, egress_ports, sfc_encap=True):
"""Creates a service function instance in the VIM
@@ -763,7 +758,7 @@
'sfc_encap': boolean stating whether this specific instance supports IETF SFC Encapsulation
Returns the VIM's service function instance ID on success or raises an exception on failure
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_sfi(self, sfi_id):
"""Obtain service function instance details of the VIM's service function instance with ID='sfi_id'
@@ -777,7 +772,7 @@
other VIM specific fields: (optional) whenever possible
Raises an exception upon error or when service function instance is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_sfi_list(self, filter_dict={}):
"""Obtain service function instances from the VIM
@@ -795,13 +790,13 @@
List can be empty if no sfi matches the filter_dict. Raise an exception only upon VIM connectivity,
authorization, or some other unspecific error
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def delete_sfi(self, sfi_id):
"""Deletes a service function instance from the VIM
Returns the service function instance ID (sfi_id) or raises an exception upon error or when sfi is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def refresh_sfis_status(self, sfi_list):
'''Get the status of the service function instances
@@ -818,7 +813,7 @@
error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR
vim_info: #Text with plain information obtained from vim (yaml.safe_dump)
'''
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def new_sf(self, name, sfis, sfc_encap=True):
"""Creates (an abstract) service function in the VIM
@@ -828,7 +823,7 @@
'sfc_encap': boolean stating whether this service function supports IETF SFC Encapsulation
Returns the VIM's service function ID on success or raises an exception on failure
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_sf(self, sf_id):
"""Obtain service function details of the VIM's service function with ID='sf_id'
@@ -859,13 +854,13 @@
List can be empty if no sf matches the filter_dict. Raise an exception only upon VIM connectivity,
authorization, or some other unspecific error
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def delete_sf(self, sf_id):
"""Deletes (an abstract) service function from the VIM
Returns the service function ID (sf_id) or raises an exception upon error or when sf is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def refresh_sfs_status(self, sf_list):
'''Get the status of the service functions
@@ -882,7 +877,7 @@
error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR
vim_info: #Text with plain information obtained from vim (yaml.safe_dump)
'''
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def new_sfp(self, name, classifications, sfs, sfc_encap=True, spi=None):
"""Creates a service function path
@@ -894,7 +889,7 @@
'spi': (optional) the Service Function Path identifier (SPI: Service Path Identifier) for this path
Returns the VIM's sfp ID on success or raises an exception on failure
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_sfp(self, sfp_id):
"""Obtain service function path details of the VIM's sfp with ID='sfp_id'
@@ -908,7 +903,7 @@
other VIM specific fields: (optional) whenever possible
Raises an exception upon error or when sfp is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def get_sfp_list(self, filter_dict={}):
"""Obtain service function paths from VIM
@@ -926,7 +921,7 @@
List can be empty if no sfp matches the filter_dict. Raise an exception only upon VIM connectivity,
authorization, or some other unspecific error
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
def refresh_sfps_status(self, sfp_list):
'''Get the status of the service function path
@@ -943,13 +938,13 @@
error_msg: #Text with VIM error message, if any. Or the VIM connection ERROR
vim_info: #Text with plain information obtained from vim (yaml.safe_dump)F
'''
- raise vimconnNotImplemented("Should have implemented this")
+ raise VimConnNotImplemented("Should have implemented this")
def delete_sfp(self, sfp_id):
"""Deletes a service function path from the VIM
Returns the sfp ID (sfp_id) or raises an exception upon error or when sf is not found
"""
- raise vimconnNotImplemented( "SFC support not implemented" )
+ raise VimConnNotImplemented("SFC support not implemented")
# NOT USED METHODS in current version. Deprecated
@@ -958,52 +953,51 @@
"""Transform host dictionary from VIM format to GUI format,
and append to the server_dict
"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def get_hosts_info(self):
"""Get the information of deployed hosts
Returns the hosts content"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def get_hosts(self, vim_tenant):
"""Get the hosts and deployed instances
Returns the hosts content"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def get_processor_rankings(self):
"""Get the processor rankings in the VIM database"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def new_host(self, host_data):
"""Adds a new host to VIM"""
"""Returns status code of the VIM response"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def new_external_port(self, port_data):
"""Adds a external port to VIM"""
"""Returns the port identifier"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
- def new_external_network(self,net_name,net_type):
+ def new_external_network(self, net_name, net_type):
"""Adds a external network to VIM (shared)"""
"""Returns the network identifier"""
- raise vimconnNotImplemented( "Should have implemented this" )
- @deprecated
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def connect_port_network(self, port_id, network_id, admin=False):
"""Connects a external port to a network"""
"""Returns status code of the VIM response"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
@deprecated
def new_vminstancefromJSON(self, vm_data):
"""Adds a VM instance to VIM"""
"""Returns the instance identifier"""
- raise vimconnNotImplemented( "Should have implemented this" )
+ raise VimConnNotImplemented("Should have implemented this")
diff --git a/RO-plugin/requirements.txt b/RO-plugin/requirements.txt
new file mode 100644
index 0000000..64c65b4
--- /dev/null
+++ b/RO-plugin/requirements.txt
@@ -0,0 +1,18 @@
+##
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+PyYAML
+paramiko
+requests
diff --git a/RO-plugin/setup.py b/RO-plugin/setup.py
new file mode 100644
index 0000000..095e0d0
--- /dev/null
+++ b/RO-plugin/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+##
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from setuptools import setup
+
+_name = "osm_ro_plugin"
+
+README = """
+===========
+osm-ro_plugin
+===========
+
+osm-ro plugin is the base class for RO VIM and SDN plugins
+"""
+
+setup(
+ name=_name,
+ description='OSM ro base class for vim and SDN plugins',
+ long_description=README,
+ version_command=('git describe --match v* --tags --long --dirty', 'pep440-git-full'),
+ # version=VERSION,
+ # python_requires='>3.5.0',
+ author='ETSI OSM',
+ author_email='alfonso.tiernosepulveda@telefonica.com',
+ maintainer='Alfonso Tierno',
+ maintainer_email='alfonso.tiernosepulveda@telefonica.com',
+ url='https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary',
+ license='Apache 2.0',
+
+ packages=[_name],
+ include_package_data=True,
+ install_requires=[
+ "requests", "paramiko", "PyYAML",
+ ],
+ setup_requires=['setuptools-version-command'],
+ entry_points={
+ 'osm_ro.plugins': ['rovim_plugin = osm_ro_plugin.vimconn:VimConnector',
+ 'rosdn_plugin = osm_ro_plugin.sdnconn:SdnConnectorBase'
+ ],
+ },
+)
diff --git a/RO-plugin/stdeb.cfg b/RO-plugin/stdeb.cfg
new file mode 100644
index 0000000..f6f532e
--- /dev/null
+++ b/RO-plugin/stdeb.cfg
@@ -0,0 +1,20 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[DEFAULT]
+X-Python3-Version : >= 3.5
+Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
+Depends3: python3-paramiko, python3-requests, python3-yaml,
+
diff --git a/RO-plugin/tox.ini b/RO-plugin/tox.ini
new file mode 100644
index 0000000..8c6e57c
--- /dev/null
+++ b/RO-plugin/tox.ini
@@ -0,0 +1,41 @@
+##
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+[tox]
+envlist = py3
+toxworkdir={homedir}/.tox
+
+[testenv]
+basepython = python3
+install_command = python3 -m pip install -r requirements.txt -U {opts} {packages}
+# deps = -r{toxinidir}/test-requirements.txt
+commands=python3 -m unittest discover -v
+
+[testenv:flake8]
+basepython = python3
+deps = flake8
+commands = flake8 osm_ro_plugin --max-line-length 120 \
+ --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,E226,W504
+
+[testenv:unittest]
+basepython = python3
+commands = python3 -m unittest osm_ro_plugin.tests
+
+[testenv:build]
+basepython = python3
+deps = stdeb
+ setuptools-version-command
+commands = python3 setup.py --command-packages=stdeb.command bdist_deb
+
diff --git a/RO/osm_ro/nfvo.py b/RO/osm_ro/nfvo.py
index 30aae22..829697c 100644
--- a/RO/osm_ro/nfvo.py
+++ b/RO/osm_ro/nfvo.py
@@ -36,7 +36,10 @@
from osm_ro.utils import deprecated
from osm_ro.vim_thread import vim_thread
import osm_ro.console_proxy_thread as cli
-from osm_ro import vimconn, vim_dummy
+from osm_ro_plugin.vim_dummy import VimDummyConnector
+from osm_ro_plugin.sdn_dummy import SdnDummyConnector
+from osm_ro_plugin.sdn_failing import SdnFailingConnector
+from osm_ro_plugin import vimconn, sdnconn
import logging
import collections
import math
@@ -58,9 +61,6 @@
# WIM
-from .wim import sdnconn
-from .wim.wimconn_dummy import DummyConnector
-from .wim.failing_connector import FailingConnector
from .http_tools import errors as httperrors
from .wim.engine import WimEngine
from .wim.persistence import WimPersistence
@@ -110,12 +110,12 @@
except Exception as e:
logger.critical("Cannot load osm_{}: {}".format(name, e))
if name:
- plugins[name] = FailingConnector("Cannot load osm_{}: {}".format(name, e))
+ plugins[name] = SdnFailingConnector("Cannot load osm_{}: {}".format(name, e))
if name and name not in plugins:
error_text = "Cannot load a module for {t} type '{n}'. The plugin 'osm_{n}' has not been" \
" registered".format(t=type, n=name)
logger.critical(error_text)
- plugins[name] = FailingConnector(error_text)
+ plugins[name] = SdnFailingConnector(error_text)
# raise NfvoException("Cannot load a module for {t} type '{n}'. The plugin 'osm_{n}' has not been registered".
# format(t=type, n=name), httperrors.Bad_Request)
@@ -150,11 +150,13 @@
# Try getting docker id. If fails, get pid
try:
with open("/proc/self/cgroup", "r") as f:
- text_id_ = f.readline()
- _, _, text_id = text_id_.rpartition("/")
- text_id = text_id.replace("\n", "")[:12]
- if text_id:
- return text_id
+ for text_id_ in f.readlines():
+ if "docker/" not in text_id_:
+ continue
+ _, _, text_id = text_id_.rpartition("/")
+ text_id = text_id.replace("\n", "")[:12]
+ if text_id:
+ return text_id
except Exception:
pass
# Return a random id
@@ -191,9 +193,9 @@
try:
worker_id = get_process_id()
if "rosdn_dummy" not in plugins:
- plugins["rosdn_dummy"] = DummyConnector
+ plugins["rosdn_dummy"] = SdnDummyConnector
if "rovim_dummy" not in plugins:
- plugins["rovim_dummy"] = vim_dummy
+ plugins["rovim_dummy"] = VimDummyConnector
# starts ovim library
ovim = Sdn(db, plugins)
@@ -230,14 +232,14 @@
try:
#if not tenant:
# return -httperrors.Bad_Request, "You must provide a valid tenant name or uuid for VIM %s" % ( vim["type"])
- myvim = plugins[plugin_name].vimconnector(
+ myvim = plugins[plugin_name](
uuid=vim['datacenter_id'], name=vim['datacenter_name'],
tenant_id=vim['vim_tenant_id'], tenant_name=vim['vim_tenant_name'],
url=vim['vim_url'], url_admin=vim['vim_url_admin'],
user=vim['user'], passwd=vim['passwd'],
config=extra, persistent_info=vim_persistent_info[thread_id]
)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
myvim = e
logger.error("Cannot launch thread for VIM {} '{}': {}".format(vim['datacenter_name'],
vim['datacenter_id'], e))
@@ -429,7 +431,7 @@
persistent_info = {}
#if not tenant:
# return -httperrors.Bad_Request, "You must provide a valid tenant name or uuid for VIM %s" % ( vim["type"])
- vim_dict[vim['datacenter_id']] = plugins[plugin_name].vimconnector(
+ vim_dict[vim['datacenter_id']] = plugins[plugin_name](
uuid=vim['datacenter_id'], name=vim['datacenter_name'],
tenant_id=vim.get('vim_tenant_id',vim_tenant),
tenant_name=vim.get('vim_tenant_name',vim_tenant_name),
@@ -442,7 +444,7 @@
logger.error("Error at VIM {}; {}: {}".format(vim["type"], type(e).__name__, str(e)))
continue
http_code = httperrors.Internal_Server_Error
- if isinstance(e, vimconn.vimconnException):
+ if isinstance(e, vimconn.VimConnException):
http_code = e.http_code
raise NfvoException("Error at VIM {}; {}: {}".format(vim["type"], type(e).__name__, str(e)), http_code)
return vim_dict
@@ -472,7 +474,7 @@
vim.delete_network(item["uuid"])
elif item["what"]=="vm":
vim.delete_vminstance(item["uuid"])
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
logger.error("Error in rollback. Not possible to delete VIM %s '%s'. Message: %s", item['what'], item["uuid"], str(e))
undeleted_items.append("{} {} from VIM {}".format(item['what'], item["uuid"], vim["name"]))
except db_base_Exception as e:
@@ -649,14 +651,14 @@
vim_images = vim.get_image_list(filter_dict)
#logger.debug('>>>>>>>> VIM images: %s', str(vim_images))
if len(vim_images) > 1:
- raise vimconn.vimconnException("More than one candidate VIM image found for filter: {}".format(str(filter_dict)), httperrors.Conflict)
+ raise vimconn.VimConnException("More than one candidate VIM image found for filter: {}".format(str(filter_dict)), httperrors.Conflict)
elif len(vim_images) == 0:
- raise vimconn.vimconnNotFoundException("Image not found at VIM with filter: '{}'".format(str(filter_dict)))
+ raise vimconn.VimConnNotFoundException("Image not found at VIM with filter: '{}'".format(str(filter_dict)))
else:
#logger.debug('>>>>>>>> VIM image 0: %s', str(vim_images[0]))
image_vim_id = vim_images[0]['id']
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
#Create the image in VIM only if image_dict['location'] or image_dict['new_location'] is not None
try:
#image_dict['location']=image_dict.get('new_location') if image_dict['location'] is None
@@ -666,15 +668,15 @@
image_created="true"
else:
#If we reach this point, then the image has image name, and optionally checksum, and could not be found
- raise vimconn.vimconnException(str(e))
- except vimconn.vimconnException as e:
+ raise vimconn.VimConnException(str(e))
+ except vimconn.VimConnException as e:
if return_on_error:
logger.error("Error creating image at VIM '%s': %s", vim["name"], str(e))
raise
image_vim_id = None
logger.warn("Error creating image at VIM '%s': %s", vim["name"], str(e))
continue
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
if return_on_error:
logger.error("Error contacting VIM to know if the image exists at VIM: %s", str(e))
raise
@@ -812,7 +814,7 @@
try:
vim.get_flavor(flavor_vim_id)
continue #flavor exist
- except vimconn.vimconnException:
+ except vimconn.VimConnException:
pass
#create flavor at vim
logger.debug("nfvo.create_or_use_flavor() adding flavor to VIM %s", vim["name"])
@@ -820,14 +822,14 @@
flavor_vim_id = None
flavor_vim_id=vim.get_flavor_id_from_data(flavor_dict)
flavor_created="false"
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
pass
try:
if not flavor_vim_id:
flavor_vim_id = vim.new_flavor(flavor_dict)
rollback_list.append({"where":"vim", "vim_id": vim_id, "what":"flavor","uuid":flavor_vim_id})
flavor_created="true"
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
if return_on_error:
logger.error("Error creating flavor at VIM %s: %s.", vim["name"], str(e))
raise
@@ -1546,7 +1548,7 @@
# Step 8. Adding the VNF to the NFVO DB
vnf_id = mydb.new_vnf_as_a_whole(tenant_id,vnf_name,vnf_descriptor,VNFCDict)
return vnf_id
- except (db_base_Exception, vimconn.vimconnException, KeyError) as e:
+ except (db_base_Exception, vimconn.VimConnException, KeyError) as e:
_, message = rollback(mydb, vims, rollback_list)
if isinstance(e, db_base_Exception):
error_text = "Exception at database"
@@ -1682,7 +1684,7 @@
# Step 8. Adding the VNF to the NFVO DB
vnf_id = mydb.new_vnf_as_a_whole2(tenant_id,vnf_name,vnf_descriptor,VNFCDict)
return vnf_id
- except (db_base_Exception, vimconn.vimconnException, KeyError) as e:
+ except (db_base_Exception, vimconn.VimConnException, KeyError) as e:
_, message = rollback(mydb, vims, rollback_list)
if isinstance(e, db_base_Exception):
error_text = "Exception at database"
@@ -1811,10 +1813,10 @@
continue
try:
myvim.delete_flavor(flavor_vim["vim_id"])
- except vimconn.vimconnNotFoundException:
+ except vimconn.VimConnNotFoundException:
logger.warn("VIM flavor %s not exist at datacenter %s", flavor_vim["vim_id"],
flavor_vim["datacenter_vim_id"] )
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
logger.error("Not possible to delete VIM flavor %s from datacenter %s: %s %s",
flavor_vim["vim_id"], flavor_vim["datacenter_vim_id"], type(e).__name__, str(e))
undeletedItems.append("flavor {} from VIM {}".format(flavor_vim["vim_id"],
@@ -1844,9 +1846,9 @@
myvim=vims[ image_vim["datacenter_id"] ]
try:
myvim.delete_image(image_vim["vim_id"])
- except vimconn.vimconnNotFoundException as e:
+ except vimconn.VimConnNotFoundException as e:
logger.warn("VIM image %s not exist at datacenter %s", image_vim["vim_id"], image_vim["datacenter_id"] )
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
logger.error("Not possible to delete VIM image %s from datacenter %s: %s %s",
image_vim["vim_id"], image_vim["datacenter_id"], type(e).__name__, str(e))
undeletedItems.append("image {} from VIM {}".format(image_vim["vim_id"], image_vim["datacenter_id"] ))
@@ -1908,7 +1910,7 @@
#print 'datacenters '+ json.dumps(datacenter, indent=4)
return datacenter
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
raise NfvoException("Not possible to get_host_list from VIM: {}".format(str(e)), e.http_code)
@@ -2873,7 +2875,7 @@
instance_id = mydb.new_instance_scenario_as_a_whole(tenant_id,instance_scenario_name, instance_scenario_description, scenarioDict)
return mydb.get_instance_scenario(instance_id)
- except (db_base_Exception, vimconn.vimconnException) as e:
+ except (db_base_Exception, vimconn.VimConnException) as e:
_, message = rollback(mydb, vims, rollbackList)
if isinstance(e, db_base_Exception):
error_text = "Exception at database"
@@ -3780,11 +3782,11 @@
returned_instance = mydb.get_instance_scenario(instance_uuid)
returned_instance["action_id"] = instance_action_id
return returned_instance
- except (NfvoException, vimconn.vimconnException, sdnconn.SdnConnectorError, db_base_Exception) as e:
+ except (NfvoException, vimconn.VimConnException, sdnconn.SdnConnectorError, db_base_Exception) as e:
message = rollback(mydb, myvims, rollbackList)
if isinstance(e, db_base_Exception):
error_text = "database Exception"
- elif isinstance(e, vimconn.vimconnException):
+ elif isinstance(e, vimconn.VimConnException):
error_text = "VIM Exception"
elif isinstance(e, sdnconn.SdnConnectorError):
error_text = "WIM Exception"
@@ -4638,7 +4640,7 @@
# try:
# vm_dict.update(myvims[datacenter_key].refresh_vms_status(vm_list[datacenter_key]) )
# failed = False
- # except vimconn.vimconnException as e:
+ # except vimconn.VimConnException as e:
# logger.error("VIM exception %s %s", type(e).__name__, str(e))
# failed_message = str(e)
# if failed:
@@ -4700,7 +4702,7 @@
# try:
# net_dict.update(myvims[datacenter_key].refresh_nets_status(net_list[datacenter_key]) )
# failed = False
- # except vimconn.vimconnException as e:
+ # except vimconn.VimConnException as e:
# logger.error("VIM exception %s %s", type(e).__name__, str(e))
# failed_message = str(e)
# if failed:
@@ -5038,7 +5040,7 @@
else:
vm_result[ vm['uuid'] ] = {"vim_result": 200, "description": "ok", "name":vm['name']}
vm_ok +=1
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
vm_result[ vm['uuid'] ] = {"vim_result": e.http_code, "name":vm['name'], "description": str(e)}
vm_error+=1
@@ -5265,7 +5267,7 @@
vim_passwd=vim_password)
datacenter_name = myvim["name"]
vim_tenant = myvim.new_tenant(vim_tenant_name, "created by openmano for datacenter "+datacenter_name)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
raise NfvoException("Not possible to create vim_tenant {} at VIM: {}".format(vim_tenant_name, e),
httperrors.Internal_Server_Error)
datacenter_tenants_dict = {}
@@ -5299,7 +5301,7 @@
thread_id = datacenter_tenants_dict["uuid"]
vim_threads["running"][thread_id] = new_thread
return thread_id
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
raise NfvoException(str(e), httperrors.Bad_Request)
@@ -5378,7 +5380,7 @@
try:
datacenter_id, myvim = get_datacenter_by_name_uuid(mydb, tenant_id, datacenter)
myvim.delete_tenant(vim_tenant_dict['vim_tenant_id'])
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
warning = "Not possible to delete vim_tenant_id {} from VIM: {} ".format(vim_tenant_dict['vim_tenant_id'], str(e))
logger.warn(warning)
except db_base_Exception as e:
@@ -5400,14 +5402,14 @@
if 'check-connectivity' in action_dict:
try:
myvim.check_vim_connectivity()
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
#logger.error("nfvo.datacenter_action() Not possible to get_network_list from VIM: %s ", str(e))
raise NfvoException(str(e), e.http_code)
elif 'net-update' in action_dict:
try:
nets = myvim.get_network_list(filter_dict={'shared': True, 'admin_state_up': True, 'status': 'ACTIVE'})
#print content
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
#logger.error("nfvo.datacenter_action() Not possible to get_network_list from VIM: %s ", str(e))
raise NfvoException(str(e), httperrors.Internal_Server_Error)
#update nets Change from VIM format to NFVO format
@@ -5466,7 +5468,7 @@
try:
vim_nets = myvim.get_network_list(filter_dict=filter_dict)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
#logger.error("nfvo.datacenter_new_netmap() Not possible to get_network_list from VIM: %s ", str(e))
raise NfvoException(str(e), httperrors.Internal_Server_Error)
if len(vim_nets)>1 and action_dict:
@@ -5507,7 +5509,7 @@
datacenter_id, myvim = get_datacenter_by_name_uuid(mydb, tenant_id, datacenter)
network = myvim.get_network_list(filter_dict=filter_dict)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
raise NfvoException("Not possible to get_sdn_net_id from VIM: {}".format(str(e)), e.http_code)
# ensure the network is defined
@@ -5678,7 +5680,7 @@
datacenter)
else:
return {item: content}
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
print("vim_action Not possible to get_{}_list from VIM: {} ".format(item, str(e)))
raise NfvoException("Not possible to get_{}_list from VIM: {}".format(item, str(e)), e.http_code)
@@ -5742,7 +5744,7 @@
content = myvim.delete_image(item_id)
else:
raise NfvoException(item + "?", httperrors.Method_Not_Allowed)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
#logger.error( "vim_action Not possible to delete_{} {}from VIM: {} ".format(item, name, str(e)))
raise NfvoException("Not possible to delete_{} {} from VIM: {}".format(item, name, str(e)), e.http_code)
@@ -5804,7 +5806,7 @@
content = myvim.new_tenant(tenant["name"], tenant.get("description"))
else:
raise NfvoException(item + "?", httperrors.Method_Not_Allowed)
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
raise NfvoException("Not possible to create {} at VIM: {}".format(item, str(e)), e.http_code)
return vim_action_get(mydb, tenant_id, datacenter, item, content)
diff --git a/RO/osm_ro/vim_thread.py b/RO/osm_ro/vim_thread.py
index 3039bab..75ab863 100644
--- a/RO/osm_ro/vim_thread.py
+++ b/RO/osm_ro/vim_thread.py
@@ -80,8 +80,8 @@
import time
import queue
import logging
-from osm_ro import vimconn
-from osm_ro.wim.sdnconn import SdnConnectorError
+from osm_ro_plugin import vimconn
+from osm_ro_plugin.sdnconn import SdnConnectorError
import yaml
from osm_ro.db_base import db_base_Exception
from http import HTTPStatus
@@ -156,12 +156,12 @@
raise SdnConnectorError(str(exc), http_code=HTTPStatus.INTERNAL_SERVER_ERROR.value) from exc
def _proccess_vim_exception(self, exc):
- if isinstance(exc, vimconn.vimconnException):
+ if isinstance(exc, vimconn.VimConnException):
raise
else:
self.logger.error("plugin={} throws a non vimconnException exception {}".format(self.plugin_name, exc),
exc_info=True)
- raise vimconn.vimconnException(str(exc), http_code=HTTPStatus.INTERNAL_SERVER_ERROR.value) from exc
+ raise vimconn.VimConnException(str(exc), http_code=HTTPStatus.INTERNAL_SERVER_ERROR.value) from exc
def get_vim_sdn_connector(self):
if self.datacenter_tenant_id:
@@ -188,7 +188,7 @@
# vim_config["wim_external_ports"] = [x for x in vim_port_mappings
# if x["service_mapping_info"].get("wim")]
self.plugin_name = "rovim_" + vim["type"]
- self.vim = self.plugins[self.plugin_name].vimconnector(
+ self.vim = self.plugins[self.plugin_name](
uuid=vim['datacenter_id'], name=vim['datacenter_name'],
tenant_id=vim['vim_tenant_id'], tenant_name=vim['vim_tenant_name'],
url=vim['vim_url'], url_admin=vim['vim_url_admin'],
@@ -408,7 +408,7 @@
try:
vim_dict = self.vim.refresh_vms_status(vm_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task=several get-VM: vimconnException when trying to refresh vms " + str(e))
vim_info = {"status": "VIM_ERROR", "error_msg": str(e)}
@@ -506,7 +506,7 @@
try:
vim_dict = self.vim.refresh_nets_status(net_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task=several get-net: vimconnException when trying to refresh nets " + str(e))
vim_info = {"status": "VIM_ERROR", "error_msg": str(e)}
@@ -644,7 +644,7 @@
elif task["action"] == "DELETE":
self.del_vm(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_nets':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self._refres_net(task)
@@ -657,7 +657,7 @@
elif task["action"] == "FIND":
database_update = self.get_net(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_wim_nets':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self.new_or_update_sdn_net(task)
@@ -670,7 +670,7 @@
elif task["action"] == "FIND":
database_update = self.get_sdn_net(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_sfis':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self._refres_sfis(task)
@@ -681,7 +681,7 @@
elif task["action"] == "DELETE":
self.del_sfi(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_sfs':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self._refres_sfs(task)
@@ -692,7 +692,7 @@
elif task["action"] == "DELETE":
self.del_sf(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_classifications':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self._refres_classifications(task)
@@ -703,7 +703,7 @@
elif task["action"] == "DELETE":
self.del_classification(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
elif task["item"] == 'instance_sfps':
if task["status"] in ('BUILD', 'DONE') and task["action"] in ("FIND", "CREATE"):
database_update = self._refres_sfps(task)
@@ -714,9 +714,9 @@
elif task["action"] == "DELETE":
self.del_sfp(task)
else:
- raise vimconn.vimconnException(self.name + "unknown task action {}".format(task["action"]))
+ raise vimconn.VimConnException(self.name + "unknown task action {}".format(task["action"]))
else:
- raise vimconn.vimconnException(self.name + "unknown task item {}".format(task["item"]))
+ raise vimconn.VimConnException(self.name + "unknown task item {}".format(task["item"]))
# TODO
except Exception as e:
if not isinstance(e, VimThreadException):
@@ -798,7 +798,7 @@
self.task_queue.put(task, False)
return None
except queue.Full:
- raise vimconn.vimconnException(self.name + ": timeout inserting a task")
+ raise vimconn.VimConnException(self.name + ": timeout inserting a task")
def del_task(self, task):
with self.task_lock:
@@ -927,7 +927,7 @@
instance_element_update = {"status": "BUILD", "vim_vm_id": vim_vm_id, "error_msg": None}
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("task={} new-VM: {}".format(task_id, e))
error_text = self._format_vim_error_msg(str(e))
task["error_msg"] = error_text
@@ -955,9 +955,9 @@
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1006,7 +1006,7 @@
instance_element_update = self._get_net_internal(task, filter_param)
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("task={} get-net: {}".format(task_id, e))
task["status"] = "FAILED"
task["vim_id"] = None
@@ -1072,7 +1072,7 @@
instance_element_update = {"vim_net_id": vim_net_id, "status": "BUILD",
"created": True, "error_msg": None}
return instance_element_update
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
self.logger.error("task={} new-net: Error {}: {}".format(task_id, action_text, e))
task["status"] = "FAILED"
task["vim_id"] = vim_net_id
@@ -1099,9 +1099,9 @@
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1251,7 +1251,7 @@
task["vim_id"] = wimconn_net_id
instance_element_update = {"wim_internal_id": wimconn_net_id, "status": sdn_status,
"created": True, "error_msg": task["error_msg"] or None}
- except (vimconn.vimconnException, SdnConnectorError) as e:
+ except (vimconn.VimConnException, SdnConnectorError) as e:
self.logger.error("task={} new-sdn-net: Error: {}".format(task_id, e))
task["status"] = "FAILED"
task["vim_id"] = wimconn_net_id
@@ -1336,7 +1336,7 @@
instance_element_update = {"status": "ACTIVE", "vim_sfi_id": vim_sfi_id, "error_msg": None}
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("Error creating Service Function Instance, task=%s: %s", task_id, str(e))
error_text = self._format_vim_error_msg(str(e))
task["error_msg"] = error_text
@@ -1353,9 +1353,9 @@
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1385,7 +1385,7 @@
instance_element_update = {"status": "ACTIVE", "vim_sf_id": vim_sf_id, "error_msg": None}
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("Error creating Service Function, task=%s: %s", task_id, str(e))
error_text = self._format_vim_error_msg(str(e))
task["error_msg"] = error_text
@@ -1402,9 +1402,9 @@
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1482,7 +1482,7 @@
"error_msg": None}
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("Error creating Classification, task=%s: %s", task_id, str(e))
error_text = self._format_vim_error_msg(str(e))
task["error_msg"] = error_text
@@ -1499,9 +1499,9 @@
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1537,7 +1537,7 @@
instance_element_update = {"status": "ACTIVE", "vim_sfp_id": vim_sfp_id, "error_msg": None}
return instance_element_update
- except (vimconn.vimconnException, VimThreadException) as e:
+ except (vimconn.VimConnException, VimThreadException) as e:
self.logger.error("Error creating Service Function, task=%s: %s", task_id, str(e))
error_text = self._format_vim_error_msg(str(e))
task["error_msg"] = error_text
@@ -1554,9 +1554,9 @@
task["error_msg"] = None
return None
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
task["error_msg"] = self._format_vim_error_msg(str(e))
- if isinstance(e, vimconn.vimconnNotFoundException):
+ if isinstance(e, vimconn.VimConnNotFoundException):
# If not found mark as Done and fill error_msg
task["status"] = "FINISHED" # with FINISHED instead of DONE it will not be refreshing
return None
@@ -1573,7 +1573,7 @@
try:
vim_dict = self.vim.refresh_sfps_status(sfp_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task={} get-sfp: vimconnException when trying to refresh sfps {}".format(task_id, e))
vim_info = {"status": "VIM_ERROR", "error_msg": str(e)}
@@ -1609,7 +1609,7 @@
try:
vim_dict = self.vim.refresh_sfis_status(sfi_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task={} get-sfi: vimconnException when trying to refresh sfis {}".format(task_id, e))
vim_info = {"status": "VIM_ERROR", "error_msg": str(e)}
@@ -1645,7 +1645,7 @@
try:
vim_dict = self.vim.refresh_sfs_status(sf_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task={} get-sf: vimconnException when trying to refresh sfs {}".format(task_id, e))
vim_info = {"status": "VIM_ERROR", "error_msg": str(e)}
@@ -1681,7 +1681,7 @@
try:
vim_dict = self.vim.refresh_classifications_status(classification_to_refresh_list)
vim_info = vim_dict[vim_id]
- except vimconn.vimconnException as e:
+ except vimconn.VimConnException as e:
# Mark all tasks at VIM_ERROR status
self.logger.error("task={} get-classification: vimconnException when trying to refresh classifications {}"
.format(task_id, e))
diff --git a/RO/osm_ro/vmwarecli.py b/RO/osm_ro/vmwarecli.py
index b7b2742..af3fde1 100755
--- a/RO/osm_ro/vmwarecli.py
+++ b/RO/osm_ro/vmwarecli.py
@@ -67,7 +67,7 @@
from pyvcloud import Http
import logging
-from osm_ro import vimconn
+from osm_ro_plugin import vimconn
import time
import uuid
import urllib3
@@ -521,7 +521,7 @@
if catalog_uuid is not None and validate_uuid4(catalog_uuid):
print("Image uploaded and uuid {}".format(catalog_uuid))
return True
- except vimconn.vimconnException as upload_exception:
+ except vimconn.VimConnException as upload_exception:
print("Failed uploaded {} image".format(image_file))
print("Error Reason: {}".format(upload_exception.message))
return False
@@ -561,10 +561,10 @@
if vapp_dict is not None:
print_vapp(vapp_dict=vapp_dict)
return True
- except vimconn.vimconnNotFoundException as notFound:
+ except vimconn.VimConnNotFoundException as notFound:
print("Failed boot {} image".format(image_name))
print(notFound.message)
- except vimconn.vimconnException as vimconError:
+ except vimconn.VimConnException as vimconError:
print("Failed boot {} image".format(image_name))
print(vimconError.message)
except:
@@ -651,7 +651,7 @@
config={'admin_username': namespace.vcdamdin, 'admin_password': namespace.vcdadminpassword})
vim.vca = vim.connect()
- except vimconn.vimconnConnectionException:
+ except vimconn.VimConnConnectionException:
print("Failed connect to vcloud director. Please check credential and hostname.")
return
diff --git a/RO/osm_ro/wim/wan_link_actions.py b/RO/osm_ro/wim/wan_link_actions.py
index 68ebf74..febbc31 100644
--- a/RO/osm_ro/wim/wan_link_actions.py
+++ b/RO/osm_ro/wim/wan_link_actions.py
@@ -45,7 +45,7 @@
NoRecordFound,
NoExternalPortFound
)
-from .sdnconn import SdnConnectorError
+from osm_ro_plugin.sdnconn import SdnConnectorError
INSTANCE_NET_STATUS_ERROR = ('DOWN', 'ERROR', 'VIM_ERROR',
'DELETED', 'SCHEDULED_DELETION')
diff --git a/RO/osm_ro/wim/wim_thread.py b/RO/osm_ro/wim/wim_thread.py
index bf35837..7d57d55 100644
--- a/RO/osm_ro/wim/wim_thread.py
+++ b/RO/osm_ro/wim/wim_thread.py
@@ -59,9 +59,9 @@
InvalidParameters as Invalid,
UndefinedAction,
)
-from .failing_connector import FailingConnector
-from .sdnconn import SdnConnectorError
-from .wimconn_dummy import DummyConnector
+from osm_ro_plugin.sdn_failing import SdnFailingConnector
+from osm_ro_plugin.sdnconn import SdnConnectorError
+from osm_ro_plugin.sdn_dummy import SdnDummyConnector
ACTIONS = {
'instance_wim_nets': wan_link_actions.ACTIONS
@@ -69,7 +69,7 @@
CONNECTORS = {
# "odl": wimconn_odl.OdlConnector,
- "dummy": DummyConnector,
+ "dummy": SdnDummyConnector,
# Add extra connectors here not managed via plugins
}
@@ -111,7 +111,7 @@
super(WimThread, self).__init__(name=name)
self.plugins = plugins
if "rosdn_dummy" not in self.plugins:
- self.plugins["rosdn_dummy"] = DummyConnector
+ self.plugins["rosdn_dummy"] = SdnDummyConnector
self.name = name
self.connector = None
@@ -183,7 +183,7 @@
error_msg_extra = ('Any task targeting WIM account {} ({}) will fail.'
.format(account_id, self.wim_account.get('name')))
self.logger.warning(error_msg_extra)
- return FailingConnector(error_msg + '\n' + error_msg_extra)
+ return SdnFailingConnector(error_msg + '\n' + error_msg_extra)
@contextmanager
def avoid_exceptions(self):
@@ -388,7 +388,7 @@
self.process_list('refresh')):
sleep(self.WAITING_TIME)
- if isinstance(self.connector, FailingConnector):
+ if isinstance(self.connector, SdnFailingConnector):
# Wait sometime to try instantiating the connector
# again and restart
# Increase the recovery time if restarting is not
diff --git a/RO/stdeb.cfg b/RO/stdeb.cfg
index 6260296..b5129dc 100644
--- a/RO/stdeb.cfg
+++ b/RO/stdeb.cfg
@@ -15,7 +15,7 @@
X-Python3-Version : >= 3.5
Maintainer: Gerardo Garcia <gerardo.garciadeblas@telefonica.com>
Depends3 : python3-bottle, python3-jsonschema, python3-mysqldb, python3-paramiko, python3-yaml,
- libmysqlclient-dev, mysql-client,
+ libmysqlclient-dev, mysql-client, python3-osm-ro-plugin,
python3-requests, python3-netaddr,
python3-osm-im,
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
index aea4749..d14f8d9 100755
--- a/devops-stages/stage-build.sh
+++ b/devops-stages/stage-build.sh
@@ -24,7 +24,11 @@
make -C RO-client clean package
cp RO-client/deb_dist/python3-osm-roclient_*.deb deb_dist/
-# VIM plugings: vmware, openstack, AWS, fos, azure, Opennebula,
+# RO plugin
+make -C RO-plugin clean package
+cp RO-plugin/deb_dist/python3-osm-ro-plugin_*.deb deb_dist/
+
+# VIM plugings: vmware, openstack, AWS, fos, azure, Opennebula,
for vim_plugin in RO-VIM-*
do
make -C $vim_plugin clean package
diff --git a/test-docker/test-gen-devops.sh b/test-docker/test-gen-devops.sh
index 3d04c1f..a869031 100755
--- a/test-docker/test-gen-devops.sh
+++ b/test-docker/test-gen-devops.sh
@@ -17,8 +17,17 @@
# contact with: nfvlabs@tid.es
##
-# Generates the debian packages; and then generates a docker image base on Dockerfile-devops and update a
-# running docker stack with the generated image
+[[ "$*" == *--help* ]] && echo \
+"This script tests docker build based on debian packages. It generates a docker image bases on Dockerfile-devops, " \
+"prints package information and if desired updates OSM RO docker with the generated image.
+Generated packages are stored at './temp' folder.
+Options:
+ --help show this help
+ --no-cache Use if found problems looking for packages
+ --update Use to update OSM, RO docker with this image" && exit 0
+
+[[ "$*" == *--no-cache* ]] && no_cache="--no_cache" || no_cache=""
+[[ "$*" == *--update* ]] && update_osm="k8s" || update_osm=""
HERE=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
export RO_BASE=$(dirname $HERE)
@@ -29,11 +38,11 @@
find $RO_BASE -name "*.pyc" -exec rm {} ";"
mkdir -p $HERE/temp
-echo -e "\n\n[STAGE 1] Builind dockerfile userd for the package generation"
+echo -e "\n\n[STAGE 1] Building dockerfile used for the package generation"
docker build $RO_BASE -f $RO_BASE/Dockerfile -t opensourcemano/ro_pkg
sleep 2
-echo "[STAGE 1.1] Generting packages inside docker ro_pkg"
+echo "[STAGE 1.1] Generating packages inside docker ro_pkg"
docker run -d --name ro_pkg opensourcemano/ro_pkg bash -c 'sleep 3600'
docker cp $RO_BASE ro_pkg:/RO
docker exec ro_pkg bash -c 'cd /RO; ./devops-stages/stage-build.sh'
@@ -44,23 +53,33 @@
echo -e "\n\n[STAGE 1.2] Print package information and copy to '$HERE/temp/'"
# print package information and copy to "$HERE/temp/"
for deb_file in $deb_files ; do
- echo; echo; echo
- echo $deb_file info:
- echo "==========================="
- docker cp ro_pkg:/RO/deb_dist/$deb_file $HERE/temp/
- dpkg -I $HERE/temp/$(basename $deb_file)
+ echo; echo; echo
+ echo $deb_file info:
+ echo "==========================="
+ docker cp ro_pkg:/RO/deb_dist/$deb_file $HERE/temp/
+ dpkg -I $HERE/temp/$(basename $deb_file)
done
# docker rm -f ro_pkg
echo -e "\n\n[STAGE 2] Building docker image opensourcemano/ro:py3_devops based on debian packages"
-docker build $HERE -f $HERE/Dockerfile-devops -t opensourcemano/ro:py3_devops ||
+docker build $HERE -f $HERE/Dockerfile-devops -t opensourcemano/ro:py3_devops $no_cache ||
! echo "error generating devops dockerfile" >&2 || exit 1
+
+[[ -z "$update_osm" ]] && exit 0
sleep 2
-# docker run -d --name ro_devops opensourcemano/ro:py3_devops
-# docker run -ti exec ro_devops ro tenant-list || ! echo "Cannot exec ro client to get server tenants" >&2 || exit 1
echo -e "\n\n[STAGE 3] Update service osm_ro with generated docker image"
-docker service update osm_ro --force --image opensourcemano/ro:py3_devops
-sleep 2
-docker container prune -f
+# try docker swarm. If fails try kebernetes
+if docker service update osm_ro --force --image opensourcemano/ro:py3_devops 2>/dev/null
+then
+ sleep 2
+ docker container prune -f
+elif kubectl -n osm patch deployment ro --patch \
+ '{"spec": {"template": {"spec": {"containers": [{"name": "ro", "image": "opensourcemano/ro:py3_devops"}]}}}}'
+then
+ kubectl -n osm scale deployment ro --replicas=0
+ kubectl -n osm scale deployment ro --replicas=1
+else
+ echo "Cannot update OSM" && exit 1
+fi
docker service logs osm_ro