diff options
Diffstat (limited to 'starlingx')
| -rw-r--r-- | starlingx/starlingx/registration/tests/test_registration.py | 2 | ||||
| -rw-r--r-- | starlingx/starlingx/registration/tests/test_registration2.py | 8 | ||||
| -rw-r--r-- | starlingx/starlingx/urls.py | 39 | ||||
| -rw-r--r-- | starlingx/tox.ini | 4 |
4 files changed, 34 insertions, 19 deletions
diff --git a/starlingx/starlingx/registration/tests/test_registration.py b/starlingx/starlingx/registration/tests/test_registration.py index 99f5ffc5..d4af22b6 100644 --- a/starlingx/starlingx/registration/tests/test_registration.py +++ b/starlingx/starlingx/registration/tests/test_registration.py @@ -271,7 +271,7 @@ class TestRegistration(test_base.TestRequest): "registry"), "{}", content_type="application/json", HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) - self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR, + self.assertEquals(status.HTTP_204_NO_CONTENT, response.status_code) @mock.patch.object(VimDriverUtils, 'get_session') diff --git a/starlingx/starlingx/registration/tests/test_registration2.py b/starlingx/starlingx/registration/tests/test_registration2.py index 6f470eea..d2084ecf 100644 --- a/starlingx/starlingx/registration/tests/test_registration2.py +++ b/starlingx/starlingx/registration/tests/test_registration2.py @@ -86,12 +86,12 @@ class TestRegistration2(unittest.TestCase): ["get"], {"get": { "content": MOCK_GET_FLAVOR_RESPONSE}}), - resp = self.view.register_helper._discover_flavors( + retcode, content = self.view.register_helper._discover_flavors( vimid="starlingx_RegionOne", session=mock_session, viminfo=MOCK_VIM_INFO ) - self.assertIsNone(resp) + self.assertEquals(retcode, 11) def test_discover_flavors_w_hpa_numa(self): restcall.req_to_aai = mock.Mock() @@ -103,9 +103,9 @@ class TestRegistration2(unittest.TestCase): "content": MOCK_GET_FLAVOR_EXTRASPECS_RESPONSE_w_hpa_numa} ]}), - resp = self.view.register_helper._discover_flavors( + retcode, content = self.view.register_helper._discover_flavors( vimid="starlingx_RegionOne", session=mock_session, viminfo=MOCK_VIM_INFO ) - self.assertIsNone(resp) + self.assertEquals(retcode, 11) diff --git a/starlingx/starlingx/urls.py b/starlingx/starlingx/urls.py index b64946ce..d08a2068 100644 --- a/starlingx/starlingx/urls.py +++ b/starlingx/starlingx/urls.py @@ -31,30 +31,45 @@ urlpatterns = [ tenants.Tenants.as_view()), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('starlingx.requests.urls')), - url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' + r'capacity_check/?$', capacity.CapacityCheck.as_view()), - url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/?$', + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' + r'infra_workload/?$', infra_workload.InfraWorkload.as_view()), - url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/infra_workload/(?P<requri>[0-9a-zA-Z_-]*)/?$', + url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' + r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]*)/?$', infra_workload.InfraWorkload.as_view()), url(r'^api/multicloud-starlingx/v0/(?P<vimid>[0-9a-zA-Z_-]+)/', include('starlingx.proxy.urls')), - # API v1, depreciated due to MULTICLOUD-335 - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry/?$', + # API v1 + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/?$', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/?$', registration.APIv1Registry.as_view()), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', include('starlingx.proxy.urlsV1')), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$', tenants.APIv1Tenants.as_view()), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/' + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/' '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('starlingx.requests.urlsV1')), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$', capacity.APIv1CapacityCheck.as_view()), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/?$', + infra_workload.APIv1InfraWorkload.as_view()), + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload/' + r'(?P<workloadid>[0-9a-zA-Z_-]*)/?$', infra_workload.APIv1InfraWorkload.as_view()), - url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', + url(r'^api/multicloud-starlingx/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' + r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', include('starlingx.proxy.urlsV1')), ] diff --git a/starlingx/tox.ini b/starlingx/tox.ini index 09d3a50f..78dc9675 100644 --- a/starlingx/tox.ini +++ b/starlingx/tox.ini @@ -32,12 +32,12 @@ deps = -r{toxinidir}/test-requirements.txt commands = coverage run --branch manage.py test starlingx - coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30 + coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*starlingx_base*,*common*" --fail-under=30 [testenv:pep8] deps=flake8 commands=flake8 [testenv:cov] -commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *site-packages*" +commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*starlingx_base*,*common*, *site-packages*" |