From: tierno Date: Wed, 12 Sep 2018 14:29:23 +0000 (+0200) Subject: Change dockerfile-local to install osm-im, lib-osm-openvim and RO from source instead... X-Git-Tag: v5.0.0~30 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=920210266c12f772ec1efe3d9494b0b6b10ac172 Change dockerfile-local to install osm-im, lib-osm-openvim and RO from source instead of making Change-Id: I03af69a2f798ed5b0645c2d3eac4ac48b15805a2 Signed-off-by: tierno --- diff --git a/.gitignore-common b/.gitignore-common index 77f6798d..92edf1bb 100644 --- a/.gitignore-common +++ b/.gitignore-common @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/charms/layers/openmano/scripts/init_mano_db.sh b/charms/layers/openmano/scripts/init_mano_db.sh index 9d8b1581..752bff8c 100755 --- a/charms/layers/openmano/scripts/init_mano_db.sh +++ b/charms/layers/openmano/scripts/init_mano_db.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/database_utils/dump_db.sh b/database_utils/dump_db.sh index c6c1dfd4..89c83f02 100755 --- a/database_utils/dump_db.sh +++ b/database_utils/dump_db.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -23,7 +23,7 @@ LICENSE_HEAD='/** -* Copyright 2017 Telefónica Investigación y Desarrollo, S.A.U. +* Copyright 2017 Telefonica Investigacion y Desarrollo, S.A.U. * This file is part of openmano * All Rights Reserved. * diff --git a/database_utils/init_mano_db.sh b/database_utils/init_mano_db.sh index 29a3ed06..be7d3eea 100755 --- a/database_utils/init_mano_db.sh +++ b/database_utils/init_mano_db.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/database_utils/mano_db_structure.sql b/database_utils/mano_db_structure.sql index 08f3f89f..2bedc389 100644 --- a/database_utils/mano_db_structure.sql +++ b/database_utils/mano_db_structure.sql @@ -1,5 +1,5 @@ /** -* Copyright 2017 Telefónica Investigación y Desarrollo, S.A.U. +* Copyright 2017 Telefonica Investigacion y Desarrollo, S.A.U. * This file is part of openmano * All Rights Reserved. * diff --git a/database_utils/migrate_mano_db.sh b/database_utils/migrate_mano_db.sh index 31873240..1cdadd25 100755 --- a/database_utils/migrate_mano_db.sh +++ b/database_utils/migrate_mano_db.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index 61fb0035..881e103a 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -8,34 +8,24 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens && \ apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper python3 python3-all python3-pip python3-setuptools && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install git python python-pip && \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ - DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \ - DEBIAN_FRONTEND=noninteractive pip3 install pip==9.0.3 && \ - DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \ - DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ - DEBIAN_FRONTEND=noninteractive pip3 install -U pyang pyangbind && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ + DEBIAN_FRONTEND=noninteractive pip2 install pip==9.0.3 && \ + DEBIAN_FRONTEND=noninteractive pip2 install -U progressbar pyvmomi pyvcloud==19.1.1 && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \ - DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \ - DEBIAN_FRONTEND=noninteractive pip install untangle && \ - DEBIAN_FRONTEND=noninteractive pip install -e git+https://github.com/python-oca/python-oca#egg=oca && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-bitarray && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python-cffi libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \ + DEBIAN_FRONTEND=noninteractive pip2 install untangle && \ + DEBIAN_FRONTEND=noninteractive pip2 install -e git+https://github.com/python-oca/python-oca#egg=oca && \ DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-client && \ - mkdir -p /root/RO && \ - make -C /root/RO clean all BRANCH=master && \ - dpkg -i /root/RO/IM/deb_dist/python-pyang_*.deb && \ - dpkg -i /root/RO/IM/deb_dist/python-pyangbind_*.deb && \ - dpkg -i /root/RO/IM/deb_dist/python-osm-im*.deb && \ - dpkg -i /root/RO/openvim/.build/python-lib-osm-openvim*.deb && \ - dpkg -i /root/RO/.build/python-osm-ro*.deb && \ + /root/RO/scripts/install-osm-im.sh --develop && \ + /root/RO/scripts/install-lib-osm-openvim.sh --develop && \ + make -C /root/RO prepare && \ + mkdir -p /var/log/osm && \ + pip2 install -e /root/RO/build && \ rm -rf /root/.cache && \ apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/RO + rm -rf /var/lib/apt/lists/* VOLUME /var/log/osm diff --git a/instance-scenarios/examples/instance-creation-complex2.yaml b/instance-scenarios/examples/instance-creation-complex2.yaml index e4ebb047..7493d52a 100644 --- a/instance-scenarios/examples/instance-creation-complex2.yaml +++ b/instance-scenarios/examples/instance-creation-complex2.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/instance-scenarios/examples/instance-creation-complex4.yaml b/instance-scenarios/examples/instance-creation-complex4.yaml index 8f20e4bb..b43010a9 100644 --- a/instance-scenarios/examples/instance-creation-complex4.yaml +++ b/instance-scenarios/examples/instance-creation-complex4.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/openmano b/openmano index 9351c81c..d3b4feb6 100755 --- a/openmano +++ b/openmano @@ -3,7 +3,7 @@ # PYTHON_ARGCOMPLETE_OK ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/openmanoconfig.py b/openmanoconfig.py index 07c5e247..70268665 100755 --- a/openmanoconfig.py +++ b/openmanoconfig.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/openmanod b/openmanod index 3fd1ae0c..a6f5fc7e 100755 --- a/openmanod +++ b/openmanod @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -36,7 +36,7 @@ import time import sys import getopt import yaml -from os import getenv as os_getenv, path as os_path +from os import environ, path as os_path from jsonschema import validate as js_v, exceptions as js_e import logging import logging.handlers as log_handlers @@ -155,17 +155,19 @@ def set_logging_file(log_file): if __name__=="__main__": - env_config = { - 'db_host': 'RO_DB_HOST', - 'db_name': 'RO_DB_NAME', - 'db_user': 'RO_DB_USER', - 'db_passwd': 'RO_DB_PASSWORD', - 'db_ovim_host': 'RO_DB_OVIM_HOST', - 'db_ovim_name': 'RO_DB_OVIM_NAME', - 'db_ovim_user': 'RO_DB_OVIM_USER', - 'db_ovim_passwd': 'RO_DB_OVIM_PASSWORD', - 'db_port': 'RO_DB_PORT', - 'db_port': 'RO_DB_PORT', + # env2config contains envioron variable names and the correspondence with configuration file openmanod.cfg keys. + # If this environ is defined, this value is taken instead of the one at at configuration file + env2config = { + 'RO_DB_HOST': 'db_host', + 'RO_DB_NAME': 'db_name', + 'RO_DB_USER': 'db_user', + 'RO_DB_PASSWORD': 'db_passwd', + # 'RO_DB_PORT': 'db_port', + 'RO_DB_OVIM_HOST': 'db_ovim_host', + 'RO_DB_OVIM_NAME': 'db_ovim_name', + 'RO_DB_OVIM_USER': 'db_ovim_user', + 'RO_DB_OVIM_PASSWORD': 'db_ovim_passwd', + # 'RO_DB_OVIM_PORT': 'db_ovim_port', } # Configure logging step 1 hostname = socket.gethostname() @@ -240,10 +242,15 @@ if __name__=="__main__": global_config['log_socket_port'] = log_socket_port # override with ENV - for config_key, env_var in env_config.items(): - if os_getenv(env_var): - global_config[config_key] = os_getenv(env_var) - + for env_k, env_v in environ.items(): + try: + if not env_k.startswith("RO_") or env_k not in env2config or not env_v: + continue + global_config[env2config[env_k]] = env_v + if env_k.endswith("PORT"): # convert to int, skip if not possible + global_config[env2config[env_k]] = int(env_v) + except Exception as e: + logger.warn("skipping environ '{}={}' because exception '{}'".format(env_k, env_v, e)) # if vnf_repository is not None: # global_config['vnf_repository'] = vnf_repository diff --git a/osm_ro/console_proxy_thread.py b/osm_ro/console_proxy_thread.py index 460a4aaa..032c774a 100644 --- a/osm_ro/console_proxy_thread.py +++ b/osm_ro/console_proxy_thread.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/db_base.py b/osm_ro/db_base.py index 3b12f745..2a6cd8c5 100644 --- a/osm_ro/db_base.py +++ b/osm_ro/db_base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/httpserver.py b/osm_ro/httpserver.py index b3b55b2f..374676e6 100644 --- a/osm_ro/httpserver.py +++ b/osm_ro/httpserver.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/nfvo.py b/osm_ro/nfvo.py index c89ea796..dd3b6aa0 100644 --- a/osm_ro/nfvo.py +++ b/osm_ro/nfvo.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/nfvo_db.py b/osm_ro/nfvo_db.py index 0418de49..9dbc9d03 100644 --- a/osm_ro/nfvo_db.py +++ b/osm_ro/nfvo_db.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/openmano_schemas.py b/osm_ro/openmano_schemas.py index 41b65be3..e3c4c672 100644 --- a/osm_ro/openmano_schemas.py +++ b/osm_ro/openmano_schemas.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/openmanoclient.py b/osm_ro/openmanoclient.py index 15662037..897eb9af 100644 --- a/osm_ro/openmanoclient.py +++ b/osm_ro/openmanoclient.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/openmanod.cfg b/osm_ro/openmanod.cfg index 2aa319ec..460bd10c 100644 --- a/osm_ro/openmanod.cfg +++ b/osm_ro/openmanod.cfg @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/utils.py b/osm_ro/utils.py index 2ae062fd..0ee8efcb 100644 --- a/osm_ro/utils.py +++ b/osm_ro/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py index c981e31f..7e31f09f 100644 --- a/osm_ro/vim_thread.py +++ b/osm_ro/vim_thread.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openvim # All Rights Reserved. # diff --git a/osm_ro/vimconn.py b/osm_ro/vimconn.py index fd8f9be0..cc06f84d 100644 --- a/osm_ro/vimconn.py +++ b/osm_ro/vimconn.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/vimconn_opennebula.py b/osm_ro/vimconn_opennebula.py index ab4ebf46..221667e7 100644 --- a/osm_ro/vimconn_opennebula.py +++ b/osm_ro/vimconn_opennebula.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2017 Telefónica Digital España S.L.U. +# Copyright 2017 Telefonica Digital Spain S.L.U. # This file is part of ETSI OSM # All Rights Reserved. # @@ -26,7 +26,7 @@ vimconnector implements all the methods to interact with OpenNebula using the XML-RPC API. """ __author__ = "Jose Maria Carmona Perez,Juan Antonio Hernando Labajo, Emilio Abraham Garrido Garcia,Alberto Florez " \ - "Pages, Andres Pozo Muñoz, Santiago Perez Marin, Onlife Networks Telefonica I+D Product Innovation " + "Pages, Andres Pozo Munoz, Santiago Perez Marin, Onlife Networks Telefonica I+D Product Innovation " __date__ = "$13-dec-2017 11:09:29$" import vimconn import requests diff --git a/osm_ro/vimconn_openstack.py b/osm_ro/vimconn_openstack.py index 53a5295a..975abafc 100644 --- a/osm_ro/vimconn_openstack.py +++ b/osm_ro/vimconn_openstack.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/osm_ro/vimconn_openvim.py b/osm_ro/vimconn_openvim.py index 5e5349d3..0e3130c9 100644 --- a/osm_ro/vimconn_openvim.py +++ b/osm_ro/vimconn_openvim.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/complex.yaml b/scenarios/examples/complex.yaml index 00bfce97..4fa3ffc0 100644 --- a/scenarios/examples/complex.yaml +++ b/scenarios/examples/complex.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/complex2.yaml b/scenarios/examples/complex2.yaml index 7bb58556..831c735b 100644 --- a/scenarios/examples/complex2.yaml +++ b/scenarios/examples/complex2.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/complex3.yaml b/scenarios/examples/complex3.yaml index 84eb1068..c128e483 100644 --- a/scenarios/examples/complex3.yaml +++ b/scenarios/examples/complex3.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/complex4.yaml b/scenarios/examples/complex4.yaml index 7682a713..a51ccbc3 100644 --- a/scenarios/examples/complex4.yaml +++ b/scenarios/examples/complex4.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/complex5.yaml b/scenarios/examples/complex5.yaml index 06335af0..5a8812e9 100644 --- a/scenarios/examples/complex5.yaml +++ b/scenarios/examples/complex5.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/scenario_vnf_additional_disk_based_image.yaml b/scenarios/examples/scenario_vnf_additional_disk_based_image.yaml index 66123692..0ae304c9 100644 --- a/scenarios/examples/scenario_vnf_additional_disk_based_image.yaml +++ b/scenarios/examples/scenario_vnf_additional_disk_based_image.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/scenario_vnf_additional_disk_empty_volume.yaml b/scenarios/examples/scenario_vnf_additional_disk_empty_volume.yaml index 0644a690..524bc373 100644 --- a/scenarios/examples/scenario_vnf_additional_disk_empty_volume.yaml +++ b/scenarios/examples/scenario_vnf_additional_disk_empty_volume.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/scenario_vnf_floating_ip.yaml b/scenarios/examples/scenario_vnf_floating_ip.yaml index 61da9e75..d717a3ba 100644 --- a/scenarios/examples/scenario_vnf_floating_ip.yaml +++ b/scenarios/examples/scenario_vnf_floating_ip.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/scenario_vnf_no_additional_devices.yaml b/scenarios/examples/scenario_vnf_no_additional_devices.yaml index 10ef4b2e..968619c3 100644 --- a/scenarios/examples/scenario_vnf_no_additional_devices.yaml +++ b/scenarios/examples/scenario_vnf_no_additional_devices.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/scenario_vnf_no_port_security.yaml b/scenarios/examples/scenario_vnf_no_port_security.yaml index df0a53b5..383439a9 100644 --- a/scenarios/examples/scenario_vnf_no_port_security.yaml +++ b/scenarios/examples/scenario_vnf_no_port_security.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/simple-cloud-init.yaml b/scenarios/examples/simple-cloud-init.yaml index 18ed3e9b..77fc17ec 100644 --- a/scenarios/examples/simple-cloud-init.yaml +++ b/scenarios/examples/simple-cloud-init.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/examples/simple.yaml b/scenarios/examples/simple.yaml index 0f7d16eb..e9c87687 100644 --- a/scenarios/examples/simple.yaml +++ b/scenarios/examples/simple.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/scenario-template.yaml b/scenarios/scenario-template.yaml index 66ecab3e..d2a861af 100644 --- a/scenarios/scenario-template.yaml +++ b/scenarios/scenario-template.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scenarios/scenario-template2.yaml b/scenarios/scenario-template2.yaml index 0719e173..59294fb8 100644 --- a/scenarios/scenario-template2.yaml +++ b/scenarios/scenario-template2.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/RO-of b/scripts/RO-of index a4e6bbd7..1e5c9175 100755 --- a/scripts/RO-of +++ b/scripts/RO-of @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/RO-start.sh b/scripts/RO-start.sh index afc746a6..7d442f02 100755 --- a/scripts/RO-start.sh +++ b/scripts/RO-start.sh @@ -66,7 +66,7 @@ function wait_db(){ #wait 120 sec if [ $attempt -ge $max_attempts ]; then echo - echo "Can not connect to database ${db_host}:${db_port} during $max_attempts sec" + echo "Cannot connect to database ${db_host}:${db_port} during $max_attempts sec" return 1 fi attempt=$[$attempt+1] @@ -78,7 +78,8 @@ function wait_db(){ echo "1/4 Apply config" -configure || exit 1 +# this is not needed anymore because envioron overwrites config file +# configure || exit 1 echo "2/4 Wait for db up" @@ -129,4 +130,9 @@ fi echo "4/4 Try to start" -/usr/bin/openmanod -c /etc/osm/openmanod.cfg --log-file=/var/log/osm/openmano.log --create-tenant=osm +# look for openmanod.cfg +RO_CONFIG_FILE="/etc/osm/openmanod.cfg" +[ -f "$RO_CONFIG_FILE" ] || RO_CONFIG_FILE=$(python -c 'import osm_ro; print(osm_ro.__path__[0])')/openmanod.cfg +[ -f "$RO_CONFIG_FILE" ] || ! echo "configuration file 'openmanod.cfg' not found" || exit 1 + +openmanod -c "$RO_CONFIG_FILE" --log-file=/var/log/osm/openmano.log --create-tenant=osm diff --git a/scripts/get-options.sh b/scripts/get-options.sh index 82ec06ca..8b2968ed 100644 --- a/scripts/get-options.sh +++ b/scripts/get-options.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/install-lib-osm-openvim.sh b/scripts/install-lib-osm-openvim.sh index b43f6fe3..c1374d50 100755 --- a/scripts/install-lib-osm-openvim.sh +++ b/scripts/install-lib-osm-openvim.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -31,6 +31,51 @@ [ -z "$_DISTRO" ] && _DISTRO="Ubuntu" +function usage(){ + echo -e "usage: sudo -E $0 [OPTIONS]" + echo -e "Install last stable source code of lib-osm-openvim and the needed packages" + echo -e " OPTIONS" + echo -e " -h --help: show this help" + echo -e " -b REFSPEC: install from source code using a specific branch (master, v2.0, ...) or tag" + echo -e " -b master (main branch)" + echo -e " -b v2.0 (v2.0 branch)" + echo -e " -b tags/v1.1.0 (a specific tag)" + echo -e " ..." + echo -e " --develop: install last master version for developers" + echo -e " --no-install-packages: use this option to skip updating and installing the requires packages. This" \ + "avoid wasting time if you are sure requires packages are present e.g. because of a previous installation" +} +while getopts ":b:h-:" o; do + case "${o}" in + b) + export COMMIT_ID=${OPTARG} + ;; + h) + usage && exit 0 + ;; + -) + [ "${OPTARG}" == "help" ] && usage && exit 0 + [ "${OPTARG}" == "develop" ] && export DEVELOP="y" && continue + [ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue + [ "${OPTARG}" == "no-install-packages" ] && export NO_PACKAGES=yes && continue + echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2 + exit 1 + ;; + \?) + echo -e "Invalid option: '-$OPTARG'\nTry $0 --help for more information" >&2 + exit 1 + ;; + :) + echo -e "Option '-$OPTARG' requires an argument\nTry $0 --help for more information" >&2 + exit 1 + ;; + *) + usage >&2 + exit 1 + ;; + esac +done + su $SUDO_USER -c "git -C '${BASEFOLDER}' clone ${GIT_OVIM_URL} lib-openvim" || ! echo "Error cannot clone from '${GIT_OVIM_URL}'" >&2 || exit 1 if [[ -n $COMMIT_ID ]] ; then @@ -48,4 +93,5 @@ fi make -C "${BASEFOLDER}/lib-openvim" prepare_lite export LANG="en_US.UTF-8" -pip2 install -e "${BASEFOLDER}/lib-openvim/build" +pip2 install -e "${BASEFOLDER}/lib-openvim/build" || ! echo "ERROR installing lib-osm-openvim library!!!" >&2 || + exit 1 diff --git a/scripts/install-openmano-service.sh b/scripts/install-openmano-service.sh index 499120db..c19b3452 100755 --- a/scripts/install-openmano-service.sh +++ b/scripts/install-openmano-service.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 9a361165..3b184940 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/install-osm-im.sh b/scripts/install-osm-im.sh index 0f9a6c6d..2fad2145 100755 --- a/scripts/install-osm-im.sh +++ b/scripts/install-osm-im.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -30,6 +30,50 @@ [ -z "$NO_PACKAGES" ] && NO_PACKAGES="" [ -z "$_DISTRO" ] && _DISTRO="Ubuntu" +function usage(){ + echo -e "usage: sudo -E $0 [OPTIONS]" + echo -e "Install last stable source code of osm-im and the needed packages" + echo -e " OPTIONS" + echo -e " -h --help: show this help" + echo -e " -b REFSPEC: install from source code using a specific branch (master, v2.0, ...) or tag" + echo -e " -b master (main branch)" + echo -e " -b v2.0 (v2.0 branch)" + echo -e " -b tags/v1.1.0 (a specific tag)" + echo -e " ..." + echo -e " --develop: install last master version for developers" + echo -e " --no-install-packages: use this option to skip updating and installing the requires packages. This" \ + "avoid wasting time if you are sure requires packages are present e.g. because of a previous installation" +} +while getopts ":b:h-:" o; do + case "${o}" in + b) + export COMMIT_ID=${OPTARG} + ;; + h) + usage && exit 0 + ;; + -) + [ "${OPTARG}" == "help" ] && usage && exit 0 + [ "${OPTARG}" == "develop" ] && export DEVELOP="y" && continue + [ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue + [ "${OPTARG}" == "no-install-packages" ] && export NO_PACKAGES=yes && continue + echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2 + exit 1 + ;; + \?) + echo -e "Invalid option: '-$OPTARG'\nTry $0 --help for more information" >&2 + exit 1 + ;; + :) + echo -e "Option '-$OPTARG' requires an argument\nTry $0 --help for more information" >&2 + exit 1 + ;; + *) + usage >&2 + exit 1 + ;; + esac +done su $SUDO_USER -c "git -C ${BASEFOLDER} clone ${GIT_OSMIM_URL} IM" || ! echo "Error cannot clone from '${GIT_OSMIM_URL}'" >&2 || exit 1 @@ -64,4 +108,4 @@ for target in vnfd nsd ; do -o "${BASEFOLDER}/IM/osm_im/${target}.py" "${BASEFOLDER}/IM/models/yang/${target}.yang" done -pip2 install -e "${BASEFOLDER}/IM" || ! echo "ERROR installing python-osm-im library!!!" >&2 || exit 1 \ No newline at end of file +pip2 install -e "${BASEFOLDER}/IM" || ! echo "ERROR installing python-osm-im library!!!" >&2 || exit 1 diff --git a/scripts/openmano-report b/scripts/openmano-report index 13c941a7..f2180af2 100755 --- a/scripts/openmano-report +++ b/scripts/openmano-report @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/scripts/service-openmano b/scripts/service-openmano index 7de9a404..a44743d3 100755 --- a/scripts/service-openmano +++ b/scripts/service-openmano @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/sdn/sdn_port_mapping.yaml b/sdn/sdn_port_mapping.yaml index 47da6e04..47124527 100644 --- a/sdn/sdn_port_mapping.yaml +++ b/sdn/sdn_port_mapping.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/setup.py b/setup.py index 733996c2..ddce5cd2 100755 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ _requirements = [ #"lib_osm_openvim", #"osm_im", "pycrypto", + "netaddr", ] setup(name=_name, diff --git a/test/RO_tests/afiinity_vnf/scenario_simple_2_vnf_afinnity.yaml b/test/RO_tests/afiinity_vnf/scenario_simple_2_vnf_afinnity.yaml index deae332f..22e372f8 100644 --- a/test/RO_tests/afiinity_vnf/scenario_simple_2_vnf_afinnity.yaml +++ b/test/RO_tests/afiinity_vnf/scenario_simple_2_vnf_afinnity.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/afiinity_vnf/vnfd_linux_2_vnfc_affinity.yaml b/test/RO_tests/afiinity_vnf/vnfd_linux_2_vnfc_affinity.yaml index 9ec7f607..53c77708 100644 --- a/test/RO_tests/afiinity_vnf/vnfd_linux_2_vnfc_affinity.yaml +++ b/test/RO_tests/afiinity_vnf/vnfd_linux_2_vnfc_affinity.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/empy_volume/scenario_additional_disk_empty_volume.yaml b/test/RO_tests/empy_volume/scenario_additional_disk_empty_volume.yaml index 61f5f38a..c0b541cb 100644 --- a/test/RO_tests/empy_volume/scenario_additional_disk_empty_volume.yaml +++ b/test/RO_tests/empy_volume/scenario_additional_disk_empty_volume.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/empy_volume/vnfd_additional_disk_empty_volume.yaml b/test/RO_tests/empy_volume/vnfd_additional_disk_empty_volume.yaml index 0e0f3eb3..7a6f5c23 100644 --- a/test/RO_tests/empy_volume/vnfd_additional_disk_empty_volume.yaml +++ b/test/RO_tests/empy_volume/vnfd_additional_disk_empty_volume.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/floating_ip/scenario_floating_ip.yaml b/test/RO_tests/floating_ip/scenario_floating_ip.yaml index 48470508..dcfb239e 100644 --- a/test/RO_tests/floating_ip/scenario_floating_ip.yaml +++ b/test/RO_tests/floating_ip/scenario_floating_ip.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/floating_ip/vnfd_floating_ip.yaml b/test/RO_tests/floating_ip/vnfd_floating_ip.yaml index 47c73ba1..0d305a9c 100644 --- a/test/RO_tests/floating_ip/vnfd_floating_ip.yaml +++ b/test/RO_tests/floating_ip/vnfd_floating_ip.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/image_based_volume/scenario_additional_disk_based_image.yaml b/test/RO_tests/image_based_volume/scenario_additional_disk_based_image.yaml index 8af2ae88..34ffeb20 100644 --- a/test/RO_tests/image_based_volume/scenario_additional_disk_based_image.yaml +++ b/test/RO_tests/image_based_volume/scenario_additional_disk_based_image.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml b/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml index bd974a8a..30aafac4 100644 --- a/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml +++ b/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/no_port_security/scenario_vnf_no_port_security.yaml b/test/RO_tests/no_port_security/scenario_vnf_no_port_security.yaml index 07c85abb..1f2e41b6 100644 --- a/test/RO_tests/no_port_security/scenario_vnf_no_port_security.yaml +++ b/test/RO_tests/no_port_security/scenario_vnf_no_port_security.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/no_port_security/vnfd_no_port_security.yaml b/test/RO_tests/no_port_security/vnfd_no_port_security.yaml index 4815298a..11874ede 100644 --- a/test/RO_tests/no_port_security/vnfd_no_port_security.yaml +++ b/test/RO_tests/no_port_security/vnfd_no_port_security.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/passthrough/scenario_p2p_passthrough.yaml b/test/RO_tests/passthrough/scenario_p2p_passthrough.yaml index ed6b53a4..4dfd3c5e 100644 --- a/test/RO_tests/passthrough/scenario_p2p_passthrough.yaml +++ b/test/RO_tests/passthrough/scenario_p2p_passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/passthrough/vnfd_1passthrough.yaml b/test/RO_tests/passthrough/vnfd_1passthrough.yaml index 94784d5d..ab24adfc 100644 --- a/test/RO_tests/passthrough/vnfd_1passthrough.yaml +++ b/test/RO_tests/passthrough/vnfd_1passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml b/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml index 369907c8..d243c0e9 100644 --- a/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml +++ b/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml b/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml index 94784d5d..ab24adfc 100644 --- a/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml +++ b/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml b/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml index 05dc91bc..9e24552d 100644 --- a/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml +++ b/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml b/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml index e424b027..2d4ad5ba 100644 --- a/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml +++ b/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_sriov_passthrough/scenario_pmp_sriov_passthrough.yaml b/test/RO_tests/pmp_sriov_passthrough/scenario_pmp_sriov_passthrough.yaml index 4b917d9f..322c094d 100644 --- a/test/RO_tests/pmp_sriov_passthrough/scenario_pmp_sriov_passthrough.yaml +++ b/test/RO_tests/pmp_sriov_passthrough/scenario_pmp_sriov_passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_sriov_passthrough/vnfd_1passthrough.yaml b/test/RO_tests/pmp_sriov_passthrough/vnfd_1passthrough.yaml index 94784d5d..ab24adfc 100644 --- a/test/RO_tests/pmp_sriov_passthrough/vnfd_1passthrough.yaml +++ b/test/RO_tests/pmp_sriov_passthrough/vnfd_1passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/pmp_sriov_passthrough/vnfd_1sriov.yaml b/test/RO_tests/pmp_sriov_passthrough/vnfd_1sriov.yaml index e424b027..2d4ad5ba 100644 --- a/test/RO_tests/pmp_sriov_passthrough/vnfd_1sriov.yaml +++ b/test/RO_tests/pmp_sriov_passthrough/vnfd_1sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_2_vnf/scenario_simple_2_vnf.yaml b/test/RO_tests/simple_2_vnf/scenario_simple_2_vnf.yaml index 95b338b0..e05d4162 100644 --- a/test/RO_tests/simple_2_vnf/scenario_simple_2_vnf.yaml +++ b/test/RO_tests/simple_2_vnf/scenario_simple_2_vnf.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_2_vnf/vnfd_linux.yaml b/test/RO_tests/simple_2_vnf/vnfd_linux.yaml index 47c84984..45c670fe 100644 --- a/test/RO_tests/simple_2_vnf/vnfd_linux.yaml +++ b/test/RO_tests/simple_2_vnf/vnfd_linux.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_cloud_init/scenario_simple-cloud-init.yaml b/test/RO_tests/simple_cloud_init/scenario_simple-cloud-init.yaml index 18ed3e9b..77fc17ec 100644 --- a/test/RO_tests/simple_cloud_init/scenario_simple-cloud-init.yaml +++ b/test/RO_tests/simple_cloud_init/scenario_simple-cloud-init.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_cloud_init/vnfd_linux-cloud-init.yaml b/test/RO_tests/simple_cloud_init/vnfd_linux-cloud-init.yaml index 92e14fb2..aa415cfa 100644 --- a/test/RO_tests/simple_cloud_init/vnfd_linux-cloud-init.yaml +++ b/test/RO_tests/simple_cloud_init/vnfd_linux-cloud-init.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_count3/scenario_linux_count3.yaml b/test/RO_tests/simple_count3/scenario_linux_count3.yaml index 2362c027..0a4116c9 100644 --- a/test/RO_tests/simple_count3/scenario_linux_count3.yaml +++ b/test/RO_tests/simple_count3/scenario_linux_count3.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_count3/vnfd_count3.yaml b/test/RO_tests/simple_count3/vnfd_count3.yaml index a4c70705..712d3923 100644 --- a/test/RO_tests/simple_count3/vnfd_count3.yaml +++ b/test/RO_tests/simple_count3/vnfd_count3.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_linux/scenario_simple_linux.yaml b/test/RO_tests/simple_linux/scenario_simple_linux.yaml index a7c2087b..4ad320df 100644 --- a/test/RO_tests/simple_linux/scenario_simple_linux.yaml +++ b/test/RO_tests/simple_linux/scenario_simple_linux.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_linux/vnfd_linux.yaml b/test/RO_tests/simple_linux/vnfd_linux.yaml index 47c84984..45c670fe 100644 --- a/test/RO_tests/simple_linux/vnfd_linux.yaml +++ b/test/RO_tests/simple_linux/vnfd_linux.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_multi_vnfc/scenario_multi_vnfc.yaml b/test/RO_tests/simple_multi_vnfc/scenario_multi_vnfc.yaml index c38b2e5b..da9e2702 100644 --- a/test/RO_tests/simple_multi_vnfc/scenario_multi_vnfc.yaml +++ b/test/RO_tests/simple_multi_vnfc/scenario_multi_vnfc.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/simple_multi_vnfc/vnfd_linux_2VMs_v02.yaml b/test/RO_tests/simple_multi_vnfc/vnfd_linux_2VMs_v02.yaml index 3a09672e..bf69cae0 100644 --- a/test/RO_tests/simple_multi_vnfc/vnfd_linux_2VMs_v02.yaml +++ b/test/RO_tests/simple_multi_vnfc/vnfd_linux_2VMs_v02.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/sr_iov/scenario_p2p_sriov.yaml b/test/RO_tests/sr_iov/scenario_p2p_sriov.yaml index 57cb2c84..a0b888ce 100644 --- a/test/RO_tests/sr_iov/scenario_p2p_sriov.yaml +++ b/test/RO_tests/sr_iov/scenario_p2p_sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/sr_iov/vnfd_1sriov.yaml b/test/RO_tests/sr_iov/vnfd_1sriov.yaml index e424b027..2d4ad5ba 100644 --- a/test/RO_tests/sr_iov/vnfd_1sriov.yaml +++ b/test/RO_tests/sr_iov/vnfd_1sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/sriov_passthrough/scenario_p2p_sriov_passthrough.yaml b/test/RO_tests/sriov_passthrough/scenario_p2p_sriov_passthrough.yaml index 49d1a2be..29bd4c88 100644 --- a/test/RO_tests/sriov_passthrough/scenario_p2p_sriov_passthrough.yaml +++ b/test/RO_tests/sriov_passthrough/scenario_p2p_sriov_passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/sriov_passthrough/vnfd_1passthrough.yaml b/test/RO_tests/sriov_passthrough/vnfd_1passthrough.yaml index 94784d5d..ab24adfc 100644 --- a/test/RO_tests/sriov_passthrough/vnfd_1passthrough.yaml +++ b/test/RO_tests/sriov_passthrough/vnfd_1passthrough.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/RO_tests/sriov_passthrough/vnfd_1sriov.yaml b/test/RO_tests/sriov_passthrough/vnfd_1sriov.yaml index e424b027..2d4ad5ba 100644 --- a/test/RO_tests/sriov_passthrough/vnfd_1sriov.yaml +++ b/test/RO_tests/sriov_passthrough/vnfd_1sriov.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/basictest.sh b/test/basictest.sh index 6e956f0f..8f5a225b 100755 --- a/test/basictest.sh +++ b/test/basictest.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/test-multivim.sh b/test/test-multivim.sh index 6505091f..077717d3 100755 --- a/test/test-multivim.sh +++ b/test/test-multivim.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/test_on_container.sh b/test/test_on_container.sh index a695e1d9..e3400b01 100755 --- a/test/test_on_container.sh +++ b/test/test_on_container.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2017 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2017 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of OSM # All Rights Reserved. # diff --git a/test/test_openmanocli.sh b/test/test_openmanocli.sh index 9bbeea56..04904671 100755 --- a/test/test_openmanocli.sh +++ b/test/test_openmanocli.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/test_openmanoclient.py b/test/test_openmanoclient.py index 5e8876b8..8e13d67a 100755 --- a/test/test_openmanoclient.py +++ b/test/test_openmanoclient.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/test_osconnector.py b/test/test_osconnector.py index ac3bf774..92d54376 100755 --- a/test/test_osconnector.py +++ b/test/test_osconnector.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh index 1933251d..0f84af33 100755 --- a/test/test_vimconn.sh +++ b/test/test_vimconn.sh @@ -1,7 +1,7 @@ #!/bin/bash ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF1.yaml b/vnfs/examples/dataplaneVNF1.yaml index 74206049..41d76452 100644 --- a/vnfs/examples/dataplaneVNF1.yaml +++ b/vnfs/examples/dataplaneVNF1.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF2.yaml b/vnfs/examples/dataplaneVNF2.yaml index f03c2080..ad870d25 100644 --- a/vnfs/examples/dataplaneVNF2.yaml +++ b/vnfs/examples/dataplaneVNF2.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF3.yaml b/vnfs/examples/dataplaneVNF3.yaml index 87e90e17..b5c80d59 100644 --- a/vnfs/examples/dataplaneVNF3.yaml +++ b/vnfs/examples/dataplaneVNF3.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF4.yaml b/vnfs/examples/dataplaneVNF4.yaml index 40762ec0..41c251c8 100644 --- a/vnfs/examples/dataplaneVNF4.yaml +++ b/vnfs/examples/dataplaneVNF4.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF_2VMs.yaml b/vnfs/examples/dataplaneVNF_2VMs.yaml index 8871270c..1fc2b4fb 100644 --- a/vnfs/examples/dataplaneVNF_2VMs.yaml +++ b/vnfs/examples/dataplaneVNF_2VMs.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/dataplaneVNF_2VMs_v02.yaml b/vnfs/examples/dataplaneVNF_2VMs_v02.yaml index bd807617..0004595e 100644 --- a/vnfs/examples/dataplaneVNF_2VMs_v02.yaml +++ b/vnfs/examples/dataplaneVNF_2VMs_v02.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/linux-cloud-init.yaml b/vnfs/examples/linux-cloud-init.yaml index 92e14fb2..aa415cfa 100644 --- a/vnfs/examples/linux-cloud-init.yaml +++ b/vnfs/examples/linux-cloud-init.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/linux.yaml b/vnfs/examples/linux.yaml index 8493e505..0163b538 100644 --- a/vnfs/examples/linux.yaml +++ b/vnfs/examples/linux.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/linux_2VMs_v02.yaml b/vnfs/examples/linux_2VMs_v02.yaml index fa1874be..a4db8953 100644 --- a/vnfs/examples/linux_2VMs_v02.yaml +++ b/vnfs/examples/linux_2VMs_v02.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/vnf_additional_disk_based_image.yaml b/vnfs/examples/vnf_additional_disk_based_image.yaml index 48f8ba91..c6fa7e67 100644 --- a/vnfs/examples/vnf_additional_disk_based_image.yaml +++ b/vnfs/examples/vnf_additional_disk_based_image.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/vnf_additional_disk_empty_volume.yaml b/vnfs/examples/vnf_additional_disk_empty_volume.yaml index ef0990f3..c879090f 100644 --- a/vnfs/examples/vnf_additional_disk_empty_volume.yaml +++ b/vnfs/examples/vnf_additional_disk_empty_volume.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/vnf_floating_ip.yaml b/vnfs/examples/vnf_floating_ip.yaml index b8fe82a1..af602fd7 100644 --- a/vnfs/examples/vnf_floating_ip.yaml +++ b/vnfs/examples/vnf_floating_ip.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/vnf_no_additional_devices.yaml b/vnfs/examples/vnf_no_additional_devices.yaml index aad2f19d..39aaa45b 100644 --- a/vnfs/examples/vnf_no_additional_devices.yaml +++ b/vnfs/examples/vnf_no_additional_devices.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/examples/vnf_no_port_security.yaml b/vnfs/examples/vnf_no_port_security.yaml index 1c26c242..f83d425d 100644 --- a/vnfs/examples/vnf_no_port_security.yaml +++ b/vnfs/examples/vnf_no_port_security.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/vnf-template-2vm.yaml b/vnfs/vnf-template-2vm.yaml index 2e0970ab..fb480820 100644 --- a/vnfs/vnf-template-2vm.yaml +++ b/vnfs/vnf-template-2vm.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # diff --git a/vnfs/vnf-template.yaml b/vnfs/vnf-template.yaml index b57ebfd7..9f01ff59 100644 --- a/vnfs/vnf-template.yaml +++ b/vnfs/vnf-template.yaml @@ -1,5 +1,5 @@ ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. #