From 824e19a34feac3183b556da0f9381c3287c519c6 Mon Sep 17 00:00:00 2001 From: Yun Huang Date: Tue, 6 Mar 2018 14:52:50 +0800 Subject: Update Ocata license header Change-Id: I45b6a8b1cbc6571a1c09d375b31e42df70b94cfa Issue-ID: MULTICLOUD-140 Signed-off-by: Yun Huang --- ocata/README.md | 7 +++++-- ocata/assembly.xml | 7 +++++-- ocata/initialize.sh | 7 +++++-- ocata/manage.py | 7 +++++-- ocata/ocata/__init__.py | 10 +++++++--- ocata/ocata/extensions/__init__.py | 10 +++++++--- ocata/ocata/extensions/tests/__init__.py | 14 ++++++++++++++ ocata/ocata/extensions/tests/test_epacaps.py | 2 +- ocata/ocata/extensions/tests/test_extensions.py | 4 ++-- ocata/ocata/extensions/urls.py | 2 +- ocata/ocata/extensions/views/__init__.py | 10 +++++++--- ocata/ocata/extensions/views/epacaps.py | 1 + ocata/ocata/extensions/views/extensions.py | 3 ++- ocata/ocata/proxy/__init__.py | 10 +++++++--- ocata/ocata/proxy/tests/__init__.py | 3 ++- ocata/ocata/proxy/tests/test_identity_proxy.py | 3 ++- ocata/ocata/proxy/tests/test_service_proxy.py | 2 +- ocata/ocata/proxy/urls.py | 2 +- ocata/ocata/proxy/views/__init__.py | 10 +++++++--- ocata/ocata/proxy/views/identityV3.py | 3 ++- ocata/ocata/proxy/views/services.py | 1 + ocata/ocata/registration/__init__.py | 10 +++++++--- ocata/ocata/registration/tests/__init__.py | 14 ++++++++++++++ ocata/ocata/registration/tests/test_registration.py | 2 +- ocata/ocata/registration/views/__init__.py | 10 +++++++--- ocata/ocata/registration/views/registration.py | 3 ++- ocata/ocata/requests/__init__.py | 3 ++- ocata/ocata/requests/urls.py | 2 +- ocata/ocata/samples/__init__.py | 10 +++++++--- ocata/ocata/samples/tests.py | 9 ++++++--- ocata/ocata/samples/urls.py | 9 ++++++--- ocata/ocata/samples/views.py | 9 ++++++--- ocata/ocata/settings.py | 7 +++++-- ocata/ocata/swagger/__init__.py | 10 +++++++--- ocata/ocata/swagger/tests.py | 9 ++++++--- ocata/ocata/swagger/urls.py | 9 ++++++--- ocata/ocata/swagger/views.py | 9 ++++++--- ocata/ocata/urls.py | 9 ++++++--- ocata/ocata/wsgi.py | 10 ++++++---- ocata/pom.xml | 9 ++++++--- ocata/run.sh | 9 +++++---- ocata/stop.sh | 11 ++++++----- ocata/vagrant/test/extsys.py | 7 +++++-- 43 files changed, 208 insertions(+), 90 deletions(-) diff --git a/ocata/README.md b/ocata/README.md index c8f0d119..1f8c9556 100644 --- a/ocata/README.md +++ b/ocata/README.md @@ -1,12 +1,15 @@ -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2017-2018 Wind River Systems, Inc. # # 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. # Micro service of MultiCloud plugin for ocata. diff --git a/ocata/assembly.xml b/ocata/assembly.xml index e60dd7fd..ea3c73a8 100644 --- a/ocata/assembly.xml +++ b/ocata/assembly.xml @@ -3,12 +3,15 @@ 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 + 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. --> diff --git a/ocata/run.sh b/ocata/run.sh index ba235461..566dc5f9 100644 --- a/ocata/run.sh +++ b/ocata/run.sh @@ -3,14 +3,15 @@ # # 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 +# 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. - -#!/bin/bash +# See the License for the specific language governing permissions and +# limitations under the License. memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid export PYTHONPATH=lib/newton:lib/share diff --git a/ocata/stop.sh b/ocata/stop.sh index 33bbc2ca..5a2209fd 100644 --- a/ocata/stop.sh +++ b/ocata/stop.sh @@ -1,16 +1,17 @@ #!/bin/bash -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2017-2018 Wind River Systems, Inc. # # 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 +# 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. - -#!/bin/bash +# See the License for the specific language governing permissions and +# limitations under the License. ps auxww | grep 'manage.py runserver 0.0.0.0:9006' | awk '{print $2}' | xargs kill -9 ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9 diff --git a/ocata/vagrant/test/extsys.py b/ocata/vagrant/test/extsys.py index 83778914..5de88155 100644 --- a/ocata/vagrant/test/extsys.py +++ b/ocata/vagrant/test/extsys.py @@ -2,12 +2,15 @@ # # 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 +# 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 json import logging -- cgit 1.2.3-korg