Fix registration pep8 error for ocata

This patch is only fixing the pep8 issues under the registration
folder for ocata release, which is only triggered by tox mannually.

Change-Id: Ie5857f5b292ec51d38f0d50b02eea08b73ee3b7a
Issue-ID: MULTICLOUD-434
Signed-off-by: Haibin Huang <haibin.huang@intel.com>

diff --git a/ocata/ocata/registration/__init__.py b/ocata/ocata/registration/__init__.py
index afa702d..ae1ce9d 100644 (file)
--- a/ocata/ocata/registration/__init__.py
+++ b/ocata/ocata/registration/__init__.py
@@ -11,4 +11,3 @@
 # 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/ocata/registration/tests/__init__.py b/ocata/ocata/registration/tests/__init__.py
index afa702d..ae1ce9d 100644 (file)
--- a/ocata/ocata/registration/tests/__init__.py
+++ b/ocata/ocata/registration/tests/__init__.py
@@ -11,4 +11,3 @@
 # 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/ocata/registration/tests/test_registration.py b/ocata/ocata/registration/tests/test_registration.py
index c28297e..2daca13 100644 (file)
--- a/ocata/ocata/registration/tests/test_registration.py
+++ b/ocata/ocata/registration/tests/test_registration.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2018 Wind River Systems, Inc.
+# Copyright (c) 2018 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ from newton_base.tests import mock_info
 from newton_base.tests import test_base
 from newton_base.util import VimDriverUtils
 
-OCATA_MOCK_VIM_INFO = {
+PIKE_MOCK_VIM_INFO = {
     "createTime": "2017-04-01 02:22:27",
     "domain": "Default",
     "name": "TiS_R4",
@@ -35,20 +35,19 @@ OCATA_MOCK_VIM_INFO = {
     "vimId": "windriver-hudson-dc_RegionOne",
     'cloud_owner': 'windriver-hudson-dc',
     'cloud_region_id': 'RegionOne',
-    'cloud_extra_info':
-        {
-        "ovsDpdk":{
-          "version": "v1",
-          "arch": "Intel64",
-          "libname":"dataProcessingAccelerationLibrary",
-          "libversion":"v12.1",
-          }
-        },
+    'cloud_extra_info': {
+        "ovsDpdk": {
+            "version": "v1",
+            "arch": "Intel64",
+            "libname": "dataProcessingAccelerationLibrary",
+            "libversion": "v12.1",
+        }
+    },
     'insecure': 'True'
 }
 
 MOCK_GET_TENANT_RESPONSE = {
-    "projects":[
+    "projects": [
         {"id": "1", "name": "project"},
         {"id": "2", "name": "project2"},
     ]
@@ -60,8 +59,8 @@ MOCK_GET_FLAVOR_RESPONSE = {
             "id": "1", "name": "micro", "vcpus": 1, "ram": "1MB",
             "disk": "1G", "OS-FLV-EXT-DATA:ephemeral": False,
             "swap": True, "os-flavor-access:is_public": True,
-            "OS-FLV-DISABLED:disabled": True, "link": [{"href":1}]
-         },
+            "OS-FLV-DISABLED:disabled": True, "link": [{"href": 1}]
+        },
         {
             "id": "2", "name": "mini", "vcpus": 2, "ram": "2",
             "disk": "2G", "OS-FLV-EXT-DATA:ephemeral": True,
@@ -95,7 +94,7 @@ MOCK_GET_AZ_RESPONSE = {
         {
             "zoneName": "production",
             "zoneState": {"available": True},
-            "hosts": { "hypervisor": "kvm" }
+            "hosts": {"hypervisor": "kvm"}
         },
         {
             "zoneName": "testing",
@@ -114,9 +113,13 @@ MOCK_GET_SNAPSHOT_RESPONSE = {
         {
             "id": 1, "name": "test", "metadata":
             {
-            "architecture": "x86", "os-distro": "clearlinux",
-            "os-version": "276", "vendor": "intel", "version": 3,
-            "selflink": "test", "prev-snapshot-id": "test-id"
+                "architecture": "x86",
+                "os-distro": "clearlinux",
+                "os-version": "276",
+                "vendor": "intel",
+                "version": 3,
+                "selflink": "test",
+                "prev-snapshot-id": "test-id"
             }
         },
         {"id": 2, "name": "test2"}
@@ -145,7 +148,7 @@ TEST_REGISTER_ENDPOINT_REQUEST = {
 
 
 # HPA UT1: CPU-PINNING
-MOCK_GET_HPA_FLAVOR_LIST1_RESPONSE= {
+MOCK_GET_HPA_FLAVOR_LIST1_RESPONSE = {
     "flavors": [
         {
             "id": "1", "name": "micro", "vcpus": 1, "ram": "1024",
@@ -187,11 +190,11 @@ MOCK_GET_HPA_FLAVOR_onap_mini_EXTRA_SPECS4_RESPONSE = {
     "extra_specs": {
         "aggregate_instance_extra_specs:storage": "local_image",
         "capabilities:cpu_info:model": "Haswell",
-            "hw:numa_nodes": "2",
-            "hw:numa_cpus.0": "0,1",
-            "hw:numa_cpus.1": "2,3,4,5",
-            "hw:numa_mem.0": "2048",
-            "hw:numa_mem.1": "2048"
+        "hw:numa_nodes": "2",
+        "hw:numa_cpus.0": "0,1",
+        "hw:numa_cpus.1": "2,3,4,5",
+        "hw:numa_mem.0": "2048",
+        "hw:numa_mem.1": "2048"
     }
 }
 
@@ -200,7 +203,7 @@ MOCK_GET_HPA_FLAVOR_onap_mini_EXTRA_SPECS5_RESPONSE = {
     "extra_specs": {
         "aggregate_instance_extra_specs:storage": "local_image",
         "capabilities:cpu_info:model": "Haswell",
-            "hw:capabilities:cpu_info:features": "avx,acpi"
+        "hw:capabilities:cpu_info:features": "avx,acpi"
     }
 }
 
@@ -209,7 +212,7 @@ MOCK_GET_HPA_FLAVOR_onap_mini_EXTRA_SPECS6_RESPONSE = {
     "extra_specs": {
         "aggregate_instance_extra_specs:storage": "local_image",
         "capabilities:cpu_info:model": "Haswell",
-            "pci_passthrough:alias": "sriov-vf-intel-8086-15b3:4"
+        "pci_passthrough:alias": "sriov-vf-intel-8086-15b3:4"
     }
 }
 
@@ -245,7 +248,7 @@ class TestRegistration(test_base.TestRequest):
             self, mock_get_vim_info, mock_get_session):
         restcall.req_to_aai = mock.Mock()
         restcall.req_to_aai.return_value = (0, {}, status.HTTP_200_OK)
-        mock_get_vim_info.return_value = OCATA_MOCK_VIM_INFO
+        mock_get_vim_info.return_value = PIKE_MOCK_VIM_INFO
         mock_get_session.return_value = test_base.get_mock_session(
             ["get"], {
                 "side_effect": [
@@ -321,8 +324,7 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
@@ -351,8 +353,7 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
@@ -381,8 +382,7 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
@@ -411,8 +411,7 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
@@ -441,8 +440,7 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
@@ -471,6 +469,4 @@ class TestRegistration(test_base.TestRequest):
             "registry"), TEST_REGISTER_ENDPOINT_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_202_ACCEPTED,
-                      response.status_code)
-
+        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)

diff --git a/ocata/ocata/registration/tests/test_registration2.py b/ocata/ocata/registration/tests/test_registration2.py
index 6e62ebe..757dccc 100644 (file)
--- a/ocata/ocata/registration/tests/test_registration2.py
+++ b/ocata/ocata/registration/tests/test_registration2.py
@@ -15,21 +15,12 @@
 import mock
 
 import unittest
-import json
 from django.test import Client
+from newton_base.tests import test_base
 from rest_framework import status
 
-from django.core.cache import cache
-from common.msapi import extsys
-
 from common.utils import restcall
-from newton_base.tests import mock_info
-from newton_base.tests import test_base
-from newton_base.util import VimDriverUtils
-
-from newton_base.registration import registration as newton_registration
 from ocata.registration.views import registration
-from newton_base.tests import test_base
 
 MOCK_VIM_INFO = {
     "createTime": "2017-04-01 02:22:27",
@@ -55,8 +46,8 @@ MOCK_GET_FLAVOR_RESPONSE = {
             "id": "1", "name": "micro", "vcpus": 1, "ram": "1MB",
             "disk": "1G", "OS-FLV-EXT-DATA:ephemeral": False,
             "swap": True, "os-flavor-access:is_public": True,
-            "OS-FLV-DISABLED:disabled": True, "link": [{"href":1}]
-         },
+            "OS-FLV-DISABLED:disabled": True, "link": [{"href": 1}]
+        },
         {
             "id": "2", "name": "mini", "vcpus": 2, "ram": "2MB",
             "disk": "2G", "OS-FLV-EXT-DATA:ephemeral": True,
@@ -72,14 +63,15 @@ MOCK_GET_FLAVOR_RESPONSE_w_hpa_numa = {
             "id": "1", "name": "onap.big", "vcpus": 6, "ram": "8192",
             "disk": "10", "OS-FLV-EXT-DATA:ephemeral": False,
             "swap": True, "os-flavor-access:is_public": True,
-            "OS-FLV-DISABLED:disabled": True, "link": [{"href":1}]
-         }
+            "OS-FLV-DISABLED:disabled": True, "link": [{"href": 1}]
+        }
     ]
 }
 MOCK_GET_FLAVOR_EXTRASPECS_RESPONSE_w_hpa_numa = {
     "hw:numa_nodes": 2
 }
 
+
 class TestRegistration2(unittest.TestCase):
     def setUp(self):
         self.client = Client()
@@ -88,13 +80,17 @@ class TestRegistration2(unittest.TestCase):
     def tearDown(self):
         pass
 
-
     def test_discover_flavors(self):
         restcall.req_to_aai = mock.Mock()
         restcall.req_to_aai.return_value = (0, {}, status.HTTP_200_OK)
-        mock_session =  test_base.get_mock_session(
-                ["get"], {"get": {
-                    "content": MOCK_GET_FLAVOR_RESPONSE}}),
+        mock_session = test_base.get_mock_session(
+            ["get"],
+            {
+                "get": {
+                    "content": MOCK_GET_FLAVOR_RESPONSE
+                }
+            }
+        )
 
         resp = self.view._discover_flavors(vimid="windriver-hudson-dc_RegionOne",
                                            session=mock_session, viminfo=MOCK_VIM_INFO)
@@ -105,11 +101,14 @@ class TestRegistration2(unittest.TestCase):
         restcall.req_to_aai = mock.Mock()
         restcall.req_to_aai.return_value = (0, {}, status.HTTP_200_OK)
         mock_session = test_base.get_mock_session(
-                ["get"], {"side_effect": [{
-                    "content": MOCK_GET_FLAVOR_RESPONSE_w_hpa_numa},
-                {
-                    "content": MOCK_GET_FLAVOR_EXTRASPECS_RESPONSE_w_hpa_numa}
-            ]}),
+            ["get"],
+            {
+                "side_effect": [
+                    {"content": MOCK_GET_FLAVOR_RESPONSE_w_hpa_numa},
+                    {"content": MOCK_GET_FLAVOR_EXTRASPECS_RESPONSE_w_hpa_numa}
+                ]
+            }
+        ),
 
         resp = self.view._discover_flavors(vimid="windriver-hudson-dc_RegionOne",
                                            session=mock_session, viminfo=MOCK_VIM_INFO)

diff --git a/ocata/ocata/registration/views/__init__.py b/ocata/ocata/registration/views/__init__.py
index afa702d..ae1ce9d 100644 (file)
--- a/ocata/ocata/registration/views/__init__.py
+++ b/ocata/ocata/registration/views/__init__.py
@@ -11,4 +11,3 @@
 # 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/ocata/registration/views/registration.py b/ocata/ocata/registration/views/registration.py
index 1e4ec4c..0de84d6 100644 (file)
--- a/ocata/ocata/registration/views/registration.py
+++ b/ocata/ocata/registration/views/registration.py
@@ -13,21 +13,16 @@
 # limitations under the License.
 
 import logging
-import json
-import uuid
-import traceback
 
 from django.conf import settings
-
 from newton_base.registration import registration as newton_registration
-from common.exceptions import VimDriverNewtonException
 from common.msapi import extsys
-from keystoneauth1.exceptions import HttpError
 
 logger = logging.getLogger(__name__)
 
 # DEBUG=True
 
+
 class Registry(newton_registration.Registry):
 
     def __init__(self):
@@ -35,6 +30,7 @@ class Registry(newton_registration.Registry):
         self.aai_base_url = settings.AAI_BASE_URL
         self._logger = logger
 
+
 class RegistryV1(Registry):
     def __init__(self):
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX