summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2018-03-19 09:14:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-19 09:14:23 +0000
commit57ff66cbe085f640deb7d1c6b57052f3282b05a5 (patch)
tree8f91b9941a4c1f3686b1c10f5c0bf05e94e3dd8d
parente791b002ecc023b2df94fbc72f7673403268b65a (diff)
parent9fb1b507dc7a77db2f9df7541932b43e88a3a4b3 (diff)
Merge "Fix Licence header missing issues"
-rw-r--r--.gitignore2
-rwxr-xr-xcode/jasmine/autogen.sh9
-rwxr-xr-xdeploy/check_os_progress.sh9
-rw-r--r--deploy/post/keystoneauth.py4
-rwxr-xr-xdeploy/trustme.sh9
-rw-r--r--docs/development/requirements/multicast.rst3
-rw-r--r--setup.py10
-rw-r--r--tests/data/openrc_conf/admin-openrc.sh8
-rw-r--r--tests/unit/test_daisy_server.py9
-rw-r--r--tests/unit/test_environment.py9
-rw-r--r--tests/unit/test_placeholder.py9
11 files changed, 79 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b636538f..8d9f688c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
__pycache__/
*.py[cod]
*.confc
-
+.pytest_cache/
# C extensions
*.so
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/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
diff --git a/setup.py b/setup.py
index d556de77..3f40f4d6 100644
--- a/setup.py
+++ b/setup.py
@@ -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