diff options
34 files changed, 141 insertions, 24 deletions
@@ -1,4 +1,4 @@ -Copyright 2015 Open Platform for NFV Project, Inc. and its contributors +Copyright 2017 Open Platform for NFV Project, Inc. and its contributors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odl-pipeline/lib/common/constants.py b/odl-pipeline/lib/common/constants.py index bf5de63..4c8b570 100644 --- a/odl-pipeline/lib/common/constants.py +++ b/odl-pipeline/lib/common/constants.py @@ -1,2 +1,11 @@ +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# # inside the pod_config dir NODE_YAML_PATH = './node.yaml' diff --git a/odl-pipeline/lib/flash-all-bridges.sh b/odl-pipeline/lib/flash-all-bridges.sh index db9d50d..d6588aa 100755 --- a/odl-pipeline/lib/flash-all-bridges.sh +++ b/odl-pipeline/lib/flash-all-bridges.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 export bridges="admin|private|public|storage" for br in $(ifconfig |grep -v br-external |grep "^br" |grep -E $bridges |awk '{print $1}');do sudo ip addr flush dev $br; diff --git a/odl-pipeline/lib/odl_reinstaller.sh b/odl-pipeline/lib/odl_reinstaller.sh index 4923ed0..cb34489 100644 --- a/odl-pipeline/lib/odl_reinstaller.sh +++ b/odl-pipeline/lib/odl_reinstaller.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) set -e export PYTHONPATH=$PYTHONPATH:$DIR diff --git a/odl-pipeline/lib/odl_reinstaller/odl_reinstaller.py b/odl-pipeline/lib/odl_reinstaller/odl_reinstaller.py index c7a78c5..655f816 100644 --- a/odl-pipeline/lib/odl_reinstaller/odl_reinstaller.py +++ b/odl-pipeline/lib/odl_reinstaller/odl_reinstaller.py @@ -1,4 +1,13 @@ #!/bin/python +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# import re import time @@ -13,6 +22,7 @@ from utils import utils_yaml @for_all_methods(log_enter_exit) class ODLReInstaller(Service): + def __init__(self): self.netvirt_url = "restconf/operational/network-topology:" \ "network-topology/topology/netvirt:1" @@ -185,6 +195,7 @@ class ODLReInstaller(Service): class ODLReinstallerException(Exception): + def __init__(self, value): self.value = value diff --git a/odl-pipeline/lib/post_process.sh b/odl-pipeline/lib/post_process.sh index 36d595f..d5522cf 100755 --- a/odl-pipeline/lib/post_process.sh +++ b/odl-pipeline/lib/post_process.sh @@ -1,2 +1,9 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 echo "Hello World"
\ No newline at end of file diff --git a/odl-pipeline/lib/setup_jenkins_networks.sh b/odl-pipeline/lib/setup_jenkins_networks.sh index d74b62e..b6c5ccc 100755 --- a/odl-pipeline/lib/setup_jenkins_networks.sh +++ b/odl-pipeline/lib/setup_jenkins_networks.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 set -e cd "$( dirname "${BASH_SOURCE[0]}" )" sudo ifdown enp0s4 2&>1 >> /dev/null /dev/null || true diff --git a/odl-pipeline/lib/test_environment.sh b/odl-pipeline/lib/test_environment.sh index 520f36a..ac209c6 100755 --- a/odl-pipeline/lib/test_environment.sh +++ b/odl-pipeline/lib/test_environment.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) set -e export PYTHONPATH=$PYTHONPATH:$DIR diff --git a/odl-pipeline/lib/test_environment/test_environment.py b/odl-pipeline/lib/test_environment/test_environment.py index 18f568d..65d40bb 100755 --- a/odl-pipeline/lib/test_environment/test_environment.py +++ b/odl-pipeline/lib/test_environment/test_environment.py @@ -1,4 +1,13 @@ #!/bin/python +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# import os from utils.utils_log import LOG, for_all_methods, log_enter_exit from utils.service import Service diff --git a/odl-pipeline/lib/tripleo_introspector.sh b/odl-pipeline/lib/tripleo_introspector.sh index 8d1b9de..1f17724 100755 --- a/odl-pipeline/lib/tripleo_introspector.sh +++ b/odl-pipeline/lib/tripleo_introspector.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) if [ -e ~/stackrc ];then . ~/stackrc diff --git a/odl-pipeline/lib/tripleo_introspector/tripleo_introspector.py b/odl-pipeline/lib/tripleo_introspector/tripleo_introspector.py index dd378ed..aa6ebbb 100755 --- a/odl-pipeline/lib/tripleo_introspector/tripleo_introspector.py +++ b/odl-pipeline/lib/tripleo_introspector/tripleo_introspector.py @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# import os import re @@ -102,6 +111,7 @@ class TripleOIntrospector(Service): class TripleOInspectorException(Exception): + def __init__(self, value): self.value = value diff --git a/odl-pipeline/lib/utils/node.py b/odl-pipeline/lib/utils/node.py index c3c2005..4fe7e22 100755 --- a/odl-pipeline/lib/utils/node.py +++ b/odl-pipeline/lib/utils/node.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/node_manager.py b/odl-pipeline/lib/utils/node_manager.py index 8a320ed..fa4c6de 100755 --- a/odl-pipeline/lib/utils/node_manager.py +++ b/odl-pipeline/lib/utils/node_manager.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -45,5 +45,6 @@ class NodeManager(object): class NodeManagerException(Exception): + def __init__(self, value): self.value = value diff --git a/odl-pipeline/lib/utils/processutils.py b/odl-pipeline/lib/utils/processutils.py index 2abb88a..98162c8 100755 --- a/odl-pipeline/lib/utils/processutils.py +++ b/odl-pipeline/lib/utils/processutils.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -85,6 +85,7 @@ def mask_password(message, secret="***"): class ProcessExecutionError(Exception): + def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None, description=None): self.exit_code = exit_code diff --git a/odl-pipeline/lib/utils/service.py b/odl-pipeline/lib/utils/service.py index cf46872..a264cea 100755 --- a/odl-pipeline/lib/utils/service.py +++ b/odl-pipeline/lib/utils/service.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/shutil.py b/odl-pipeline/lib/utils/shutil.py index 5f6d482..787820e 100755 --- a/odl-pipeline/lib/utils/shutil.py +++ b/odl-pipeline/lib/utils/shutil.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/ssh_client.py b/odl-pipeline/lib/utils/ssh_client.py index 464a74e..b38bc37 100755 --- a/odl-pipeline/lib/utils/ssh_client.py +++ b/odl-pipeline/lib/utils/ssh_client.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/ssh_util.py b/odl-pipeline/lib/utils/ssh_util.py index 635a718..4de4e52 100755 --- a/odl-pipeline/lib/utils/ssh_util.py +++ b/odl-pipeline/lib/utils/ssh_util.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/tripleo_helper.py b/odl-pipeline/lib/utils/tripleo_helper.py index 702e811..0c5695e 100644 --- a/odl-pipeline/lib/utils/tripleo_helper.py +++ b/odl-pipeline/lib/utils/tripleo_helper.py @@ -1,3 +1,12 @@ +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# import re import processutils from processutils import execute @@ -23,12 +32,12 @@ class TripleoHelper(): @staticmethod def get_virtual_node_name_from_mac(mac): vnode_names, _ = execute('virsh list|awk \'{print ' - '$2}\'', shell=True) + '$2}\'', shell=True, as_root=True) for node in vnode_names.split('\n'): if 'baremetal' in node: admin_net_mac, _ = execute( 'virsh domiflist %s |grep admin |awk \'{print $5}\'' - % node, shell=True) + % node, shell=True, as_root=True) if admin_net_mac.replace('\n', '') == mac: return node raise Exception('Could not find corresponding virtual node for MAC: %s' @@ -36,16 +45,18 @@ class TripleoHelper(): @staticmethod def get_undercloud_ip(): - out, _ = execute('virsh domifaddr undercloud', shell=True) + out, _ = execute('virsh domifaddr undercloud', shell=True, + as_root=True) return re.findall('([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', out)[0] @staticmethod def get_undercloud(): return Node('undercloud', address=TripleoHelper.get_undercloud_ip(), - user='stack') + user='stack', password='stack') class TripleOHelperException(Exception): + def __init__(self, value): self.value = value diff --git a/odl-pipeline/lib/utils/utils_log.py b/odl-pipeline/lib/utils/utils_log.py index 9d7648f..64590a0 100755 --- a/odl-pipeline/lib/utils/utils_log.py +++ b/odl-pipeline/lib/utils/utils_log.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/lib/utils/utils_yaml.py b/odl-pipeline/lib/utils/utils_yaml.py index b9357f6..e5b42af 100755 --- a/odl-pipeline/lib/utils/utils_yaml.py +++ b/odl-pipeline/lib/utils/utils_yaml.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/odl-pipeline/odl-pipeline-common.sh b/odl-pipeline/odl-pipeline-common.sh index 6d7cd71..9f2befc 100644 --- a/odl-pipeline/odl-pipeline-common.sh +++ b/odl-pipeline/odl-pipeline-common.sh @@ -1,4 +1,11 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 PIPELINE_HOME=$WORKSPACE/sdnvpn/odl-pipeline LIB=$PIPELINE_HOME/lib CLONER_INFO=/home/jenkins/cloner-info/ diff --git a/odl-pipeline/setup.sh b/odl-pipeline/setup.sh index 2d32bb1..4ec3c4b 100644 --- a/odl-pipeline/setup.sh +++ b/odl-pipeline/setup.sh @@ -1,2 +1,9 @@ #!/bin/bash +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 sudo apt-get install -y python python-yaml python-six openvswitch diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py index f6206cf..7fc0cd4 100644 --- a/sdnvpn/lib/config.py +++ b/sdnvpn/lib/config.py @@ -1,3 +1,12 @@ +#!/usr/bin/python +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + import yaml import os diff --git a/sdnvpn/lib/results.py b/sdnvpn/lib/results.py index f665328..5661d07 100644 --- a/sdnvpn/lib/results.py +++ b/sdnvpn/lib/results.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2016 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index b551954..00d0fa7 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py index 924a0e5..5ca7691 100644 --- a/sdnvpn/test/functest/run_tests.py +++ b/sdnvpn/test/functest/run_tests.py @@ -1,6 +1,6 @@ #!/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/tempest.py b/sdnvpn/test/functest/tempest.py index 8928e7c..728802f 100644 --- a/sdnvpn/test/functest/tempest.py +++ b/sdnvpn/test/functest/tempest.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index b2ef6d2..a5c1494 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index 5bf2c0f..b3481aa 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 5a8e9b0..36e2d1a 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index 1cadc51..bb3ea3e 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 05d40fa..18b6dda 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index 7a0a8c6..3aa0a79 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (c) 2015 All rights reserved +# Copyright (c) 2017 All rights reserved # This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at |