From 2e2155173c047ac2acb8a626019eda2d87f785ed Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 28 Nov 2018 09:37:52 +0000 Subject: [PATCH] bug 544 Adding license headers Change-Id: Iaac385a174e453ed96c14532742fc02dd3d7ff47 Signed-off-by: tierno --- .gitignore-common | 14 ++++++++++++++ Dockerfile.fromdeb | 15 +++++++++++++++ Jenkinsfile | 15 +++++++++++++++ devops-stages/stage-archive.sh | 15 +++++++++++++++ devops-stages/stage-build.sh | 19 ++++++++++--------- devops-stages/stage-test.sh | 16 +++++++++++++++- osm_lcm/ROclient.py | 4 ---- osm_lcm/__init__.py | 14 ++++++++++++++ osm_lcm/lcm.cfg | 15 +++++++++++++++ osm_lcm/lcm.py | 16 ++++++++++++++++ osm_lcm/lcm_utils.py | 16 +++++++++++++++- osm_lcm/netslice.py | 1 - osm_lcm/ns.py | 17 ++++++++++++++++- osm_lcm/osm-lcm.service | 16 ++++++++++++++++ osm_lcm/vim_sdn.py | 17 ++++++++++++++++- requirements.txt | 6 ++++-- 16 files changed, 196 insertions(+), 20 deletions(-) diff --git a/.gitignore-common b/.gitignore-common index 099610f..25753f6 100644 --- a/.gitignore-common +++ b/.gitignore-common @@ -1,3 +1,17 @@ +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + # This is a template with common files to be igonored, after clone make a copy to .gitignore # cp .gitignore-common .gitignore diff --git a/Dockerfile.fromdeb b/Dockerfile.fromdeb index 25f6c66..d49995a 100644 --- a/Dockerfile.fromdeb +++ b/Dockerfile.fromdeb @@ -1,3 +1,18 @@ +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # This creates som/LCM docker from from last stable package FROM ubuntu:16.04 diff --git a/Jenkinsfile b/Jenkinsfile index 15353c6..8140c68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,18 @@ +/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + properties([ parameters([ string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'), diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh index 5e8e072..8759429 100755 --- a/devops-stages/stage-archive.sh +++ b/devops-stages/stage-archive.sh @@ -1,4 +1,19 @@ #!/bin/sh + +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + MDG=LCM rm -rf pool rm -rf dists diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index 4efe9d6..00f093c 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -1,17 +1,18 @@ #!/bin/sh -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## # moved to a Makefile in order to add post install. Needed for "pip3 install aiokafka", # that is not available with a package diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index c6623f8..0cd6714 100755 --- a/devops-stages/stage-test.sh +++ b/devops-stages/stage-test.sh @@ -1,3 +1,17 @@ #!/bin/sh -tox -e flake8 +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + +tox -e flake8 diff --git a/osm_lcm/ROclient.py b/osm_lcm/ROclient.py index d0bef33..dad89d5 100644 --- a/osm_lcm/ROclient.py +++ b/osm_lcm/ROclient.py @@ -3,8 +3,6 @@ ## # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. -# This file is part of openmano -# All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -18,8 +16,6 @@ # License for the specific language governing permissions and limitations # under the License. # -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: nfvlabs@tid.es ## """ diff --git a/osm_lcm/__init__.py b/osm_lcm/__init__.py index 3a63f8e..6c890b4 100644 --- a/osm_lcm/__init__.py +++ b/osm_lcm/__init__.py @@ -1,3 +1,17 @@ +## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + # version moved to lcm.py. uncomment if LCM is installed as library and installed # version = '0.1.12' # version_date = '2018-08-23' diff --git a/osm_lcm/lcm.cfg b/osm_lcm/lcm.cfg index 5e54d7f..01accff 100644 --- a/osm_lcm/lcm.cfg +++ b/osm_lcm/lcm.cfg @@ -1,3 +1,18 @@ +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## # TODO currently is a pure yaml format. Consider to change it to [ini] style with yaml inside to be coherent with other modules diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py index c6f839a..a88e785 100644 --- a/osm_lcm/lcm.py +++ b/osm_lcm/lcm.py @@ -1,6 +1,22 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + import asyncio import yaml import logging diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py index 2c84356..048ccff 100644 --- a/osm_lcm/lcm_utils.py +++ b/osm_lcm/lcm_utils.py @@ -1,6 +1,20 @@ -#!/usr/bin/python3 # -*- coding: utf-8 -*- +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## from collections import OrderedDict from osm_common.dbbase import DbException diff --git a/osm_lcm/netslice.py b/osm_lcm/netslice.py index aecac77..6f742c2 100644 --- a/osm_lcm/netslice.py +++ b/osm_lcm/netslice.py @@ -1,4 +1,3 @@ -#!/usr/bin/python3 # -*- coding: utf-8 -*- import asyncio diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index eef3e89..6589e22 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -1,6 +1,21 @@ -#!/usr/bin/python3 # -*- coding: utf-8 -*- +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + import asyncio import yaml import logging diff --git a/osm_lcm/osm-lcm.service b/osm_lcm/osm-lcm.service index 9736f96..ccadcce 100644 --- a/osm_lcm/osm-lcm.service +++ b/osm_lcm/osm-lcm.service @@ -1,3 +1,19 @@ +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + [Unit] Description=LCM server (OSM LCM) diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py index 610bd97..d821fb2 100644 --- a/osm_lcm/vim_sdn.py +++ b/osm_lcm/vim_sdn.py @@ -1,6 +1,21 @@ -#!/usr/bin/python3 # -*- coding: utf-8 -*- +## +# Copyright 2018 Telefonica S.A. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +## + import asyncio import logging import logging.handlers diff --git a/requirements.txt b/requirements.txt index da0be6f..c1e758a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,16 @@ +## # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at - +# # http://www.apache.org/licenses/LICENSE-2.0 - +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +## pyyaml==3.* aiohttp==0.20.2 -- 2.17.1