initial code cleanup for openstack/ranger-agent

Cleanup of intital code, mostly involving licensing messages. Change-Id: I0576da614b16120d18789bea3a52fe0805dbeb7a
2017-07-26 18:09:07 -07:00 · 2017-07-26 18:09:07 -07:00 · db8b5e0104
commit db8b5e0104
parent f19f33bdec
58 changed files with 131 additions and 61 deletions
--- a/4
+++ b/4
@ -1,7 +1,7 @@
-This is the ORD project. At the highest view, provides an API interface
+This is the ranger-agent project. At the highest view, provides an API interface
 for users to move OpenStack templates from CodeCloud into OS Heat.

 This project is designed to show a recommended set of modules
 for creating a simple API server and Engine, with a versioned API, clean separation
 of modules, a standard way of structuring both unit and functional tests,
-configuration files,and documentation.
+configuration files, and documentation.
--- a/doc/Makefile
+++ b/doc/Makefile
@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXSOURCE 	= source
+SPHINXSOURCE  = source
 PAPER         =
 BUILDDIR      = build

--- a/doc/api_samples/ord-notifier-response.json
+++ b/doc/api_samples/ord-notifier-response.json
@ -1,7 +1,7 @@
 {
  "ord-notifier-response": {
    "request-id": "1",
-    "resource-id": "1",    
+    "resource-id": "1",
    "resource-type": "customer",
    "resource-template-version": "1",
    "resource-template-name": "template.yaml",
@ -11,6 +11,6 @@
    "region": "X" ,
    "status": "submitted",
    "error-code": "",
-    "error-msg": ""   
+    "error-msg": ""
  }
 }
--- a/doc/api_samples/ord-notifier.json
+++ b/doc/api_samples/ord-notifier.json
@ -1,12 +1,12 @@
 {
  "ord-notifier": {
    "request-id": "1",
-    "resource-id": "1",    
+    "resource-id": "1",
    "resource-type": "customer",
    "resource-template-version": "1",
    "resource-template-name": "template.yaml",
    "resource-template-type": "hot",
    "operation": "create",
-    "region": "X" 
+    "region": "X"
  }
 }
--- a/doc/api_samples/rds-listener.json
+++ b/doc/api_samples/rds-listener.json
@ -1,16 +1,16 @@
 {
  "rds-listener": {
    "request-id": "1",
-    "resource-id": "1",    
+    "resource-id": "1",
    "resource-type": "customer",
    "resource-template-version": "1",
    "resource-template-name": "template.yaml",
    "resource-template-type": "hot",
    "operation": "create",
    "ord-notifier-id": "1",
-    "region": "X" ,
+    "region": "X",
    "status": "completed",
    "error-code": "",
-    "error-msg": ""   
+    "error-msg": ""
  }
 }
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011 OpenStack, LLC.
+# Copyright (c) 2012 OpenStack Foundation
+# 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.
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -1,5 +1,5 @@
 ..
-      Copyright 2011 OpenStack, LLC.
+      Copyright (c) 2012 OpenStack Foundation
      All Rights Reserved.

      Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/etc/ord.conf
+++ b/etc/ord.conf
@ -41,6 +41,6 @@ rabbit_port = 5672
 #This will assume the required ssh-keys are all already populated
 orm_template_repo_url = git@127.0.0.1:/home/repo/ranger_repo.git
 #This is fake service call will be replaced with rds url
-rds_listener_endpoint = http://135.16.225.210:8777/v1/rds/status
+rds_listener_endpoint = http://127.0.0.1:8777/v1/rds/status
 repo_pull_check_wait = 2
 retry_limits = 5
--- a/ord/init.py
+++ b/ord/init.py
@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-
+#
+# Copyright (c) 2012 OpenStack Foundation
+# 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
 # a copy of the License at
--- a/ord/api/init.py
+++ b/ord/api/init.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/app.py
+++ b/ord/api/app.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/config.py
+++ b/ord/api/config.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/controllers/root.py
+++ b/ord/api/controllers/root.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/controllers/v1/api.py
+++ b/ord/api/controllers/v1/api.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/controllers/v1/root.py
+++ b/ord/api/controllers/v1/root.py
@ -1,5 +1,5 @@
-#
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/api/middleware.py
+++ b/ord/api/middleware.py
@ -1,5 +1,5 @@
-#
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/client/client.py
+++ b/ord/client/client.py
@ -1,3 +1,4 @@
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/ord/client/getrepo.py
+++ b/ord/client/getrepo.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/client/heat.py
+++ b/ord/client/heat.py
@ -1,3 +1,4 @@
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/ord/client/rpcapi.py
+++ b/ord/client/rpcapi.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/client/rpcengine.py
+++ b/ord/client/rpcengine.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/client/utils.py
+++ b/ord/client/utils.py
@ -1,3 +1,5 @@
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/cmd/init.py
+++ b/ord/cmd/init.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/cmd/api.py
+++ b/ord/cmd/api.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/cmd/engine.py
+++ b/ord/cmd/engine.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/cmd/fake_rds_listener.py
+++ b/ord/cmd/fake_rds_listener.py
@ -1,4 +1,19 @@
 # -*- coding:utf-8 -*-
+# Copyright (c) 2012 OpenStack Foundation
+# 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 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 argparse
 import sys
--- a/ord/cmd/manage.py
+++ b/ord/cmd/manage.py
@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 #
 # Copyright 2014 OpenStack Foundation
+# 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
--- a/ord/common/exceptions.py
+++ b/ord/common/exceptions.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/common/utils.py
+++ b/ord/common/utils.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/api.py
+++ b/ord/db/api.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/base.py
+++ b/ord/db/base.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/migration.py
+++ b/ord/db/migration.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/model_base.py
+++ b/ord/db/model_base.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/sqlalchemy/api.py
+++ b/ord/db/sqlalchemy/api.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/sqlalchemy/migrate_repo/manage.py
+++ b/ord/db/sqlalchemy/migrate_repo/manage.py
@ -1,5 +1,6 @@
 #!/usr/bin/env python
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/sqlalchemy/migration.py
+++ b/ord/db/sqlalchemy/migration.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/db/sqlalchemy/models.py
+++ b/ord/db/sqlalchemy/models.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/engine/app.py
+++ b/ord/engine/app.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/engine/engine.py
+++ b/ord/engine/engine.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/engine/workerfactory.py
+++ b/ord/engine/workerfactory.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/hacking/checks.py
+++ b/ord/hacking/checks.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/i18n.py
+++ b/ord/i18n.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/openstack/common/_i18n.py
+++ b/ord/openstack/common/_i18n.py
@ -1,3 +1,6 @@
+# Copyright (c) 2012 OpenStack Foundation
+# 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
 #    a copy of the License at
--- a/ord/openstack/common/local.py
+++ b/ord/openstack/common/local.py
@ -1,4 +1,4 @@
-# Copyright 2011 OpenStack Foundation.
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/ord/openstack/common/log.py
+++ b/ord/openstack/common/log.py
@ -1,6 +1,4 @@
-# Copyright 2011 OpenStack Foundation.
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/ord/service.py
+++ b/ord/service.py
@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/base.py
+++ b/ord/tests/base.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/api/controllers/v1/test_api.py
+++ b/ord/tests/unit/api/controllers/v1/test_api.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/client/test_getrepo.py
+++ b/ord/tests/unit/client/test_getrepo.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/client/test_heat.py
+++ b/ord/tests/unit/client/test_heat.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/client/test_rpcapi.py
+++ b/ord/tests/unit/client/test_rpcapi.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/client/test_rpcengine.py
+++ b/ord/tests/unit/client/test_rpcengine.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/common/test_exceptions.py
+++ b/ord/tests/unit/common/test_exceptions.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/common/test_utils.py
+++ b/ord/tests/unit/common/test_utils.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/db/sqlalchemy/test_api.py
+++ b/ord/tests/unit/db/sqlalchemy/test_api.py
@ -1,4 +1,5 @@
-#  Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/engine/test_workerfactory.py
+++ b/ord/tests/unit/engine/test_workerfactory.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/ord/tests/unit/engine/test_workerthread.py
+++ b/ord/tests/unit/engine/test_workerthread.py
@ -1,4 +1,5 @@
-# Copyright 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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
--- a/setup.py
+++ b/setup.py
@ -1,4 +1,11 @@
-# Copyright (c) 2016 ATT
+# Copyright (c) 2012 OpenStack Foundation
+# 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 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,