diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | code/install_interface_patch.sh | 4 | ||||
| -rwxr-xr-x | code/jasmine/autogen.sh | 9 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 2 | ||||
| -rwxr-xr-x | deploy/check_os_progress.sh | 9 | ||||
| -rw-r--r-- | deploy/post/keystoneauth.py | 4 | ||||
| -rwxr-xr-x | deploy/trustme.sh | 9 | ||||
| -rw-r--r-- | docs/development/requirements/multicast.rst | 3 | ||||
| -rw-r--r-- | setup.py | 10 | ||||
| -rw-r--r-- | tests/data/openrc_conf/admin-openrc.sh | 8 | ||||
| -rw-r--r-- | tests/unit/test_daisy_server.py | 9 | ||||
| -rw-r--r-- | tests/unit/test_environment.py | 9 | ||||
| -rw-r--r-- | tests/unit/test_placeholder.py | 9 |
13 files changed, 80 insertions, 7 deletions
@@ -9,7 +9,7 @@ __pycache__/ *.py[cod] *.confc - +.pytest_cache/ # C extensions *.so diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh index d70e18f6..3a17f414 100755 --- a/code/install_interface_patch.sh +++ b/code/install_interface_patch.sh @@ -17,9 +17,7 @@ mkdir -p $imagedir if [ ! -e "$imagedir/$imagename" ];then cp $imagename $imagedir fi -if [ ! -e "$imagedir/registry-server.tar" ];then - cp registry-server.tar $imagedir -fi + cp CentOS*.iso /var/lib/daisy/kolla mkdir -p /var/lib/daisy/images/ diff --git a/code/jasmine/autogen.sh b/code/jasmine/autogen.sh index 5bf25ecc..d99fe580 100755 --- a/code/jasmine/autogen.sh +++ b/code/jasmine/autogen.sh @@ -1,4 +1,13 @@ #!/bin/sh +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 +############################################################################## + # Run this to generate all the initial makefiles, etc. mkdir -p m4 echo Building configuration system... diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh index 6ccb0ee0..665b0729 100755 --- a/code/makefile_patch.sh +++ b/code/makefile_patch.sh @@ -129,12 +129,10 @@ function check_or_download_file_sha512sum() if [ ! -d $CACHE_PATH ]; then mkdir -p $CACHE_PATH ; fi check_or_download_file $CACHE_PATH $isourl check_or_download_file_sha512sum $CACHE_PATH $imageserver/${imagename} ${imageserver}/${imagename}.sha512sum -check_or_download_file $CACHE_PATH "http://daisycloud.org/static/files/registry-server.tar" check_or_download_file $CACHE_PATH ${cirros_url} cp $CACHE_PATH/${isoname} ${target_dir}/ cp $CACHE_PATH/$imagename ${target_dir}/ -cp $CACHE_PATH/registry-server.tar ${target_dir}/ cp $CACHE_PATH/${cirros_filename} ${target_dir}/ cp $TOOLS_PATH/setup/install_interface_patch.sh ${target_dir}/ diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh index fe452503..8f8e6144 100755 --- a/deploy/check_os_progress.sh +++ b/deploy/check_os_progress.sh @@ -1,4 +1,13 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# 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 +############################################################################## + usage() { cat << EOF diff --git a/deploy/post/keystoneauth.py b/deploy/post/keystoneauth.py index 2d7d0e75..f3d25ae0 100644 --- a/deploy/post/keystoneauth.py +++ b/deploy/post/keystoneauth.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Coreporation and others. +# Copyright (c) 2017 ZTE Corporation and others. # feng.xiaowei@zte.com.cn # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -30,6 +30,8 @@ class Keystoneauth(object): def _parse_openrc(self): def parse_line(creds, line): + if line.startswith('#') or "=" not in line: + return creds var = line.rstrip('"\n').replace('export ', '').split("=") # The two next lines should be modified as soon as rc_file # conforms with common rules. Be aware that it could induce diff --git a/deploy/trustme.sh b/deploy/trustme.sh index 38e2d838..1a599be6 100755 --- a/deploy/trustme.sh +++ b/deploy/trustme.sh @@ -1,4 +1,13 @@ #!/bin/sh +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# 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 +############################################################################## + #to be trusted by other host and no password needed when use ssh command #check parameters legality diff --git a/docs/development/requirements/multicast.rst b/docs/development/requirements/multicast.rst index ba314d3a..fcce83a8 100644 --- a/docs/development/requirements/multicast.rst +++ b/docs/development/requirements/multicast.rst @@ -1,3 +1,6 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + Requirement =========== 1. When deploying a large OPNFV/OpenStack cluster, we would like to take the advantage of UDP @@ -1,5 +1,15 @@ #!/usr/bin/env python +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 +############################################################################## + + from setuptools import setup setup( diff --git a/tests/data/openrc_conf/admin-openrc.sh b/tests/data/openrc_conf/admin-openrc.sh index 3db0bcf3..2440fda8 100644 --- a/tests/data/openrc_conf/admin-openrc.sh +++ b/tests/data/openrc_conf/admin-openrc.sh @@ -1,3 +1,11 @@ +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 OS_PROJECT_DOMAIN_NAME=Default export OS_USER_DOMAIN_NAME=Default export OS_PROJECT_NAME=admin diff --git a/tests/unit/test_daisy_server.py b/tests/unit/test_daisy_server.py index ea9c495c..007279a7 100644 --- a/tests/unit/test_daisy_server.py +++ b/tests/unit/test_daisy_server.py @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 pytest import mock diff --git a/tests/unit/test_environment.py b/tests/unit/test_environment.py index f7cf5985..a0b39ffd 100644 --- a/tests/unit/test_environment.py +++ b/tests/unit/test_environment.py @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 copy import mock diff --git a/tests/unit/test_placeholder.py b/tests/unit/test_placeholder.py index 457e464c..a5298e14 100644 --- a/tests/unit/test_placeholder.py +++ b/tests/unit/test_placeholder.py @@ -1,2 +1,11 @@ +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# +# 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 +############################################################################## + def test_holder(): assert True |