diff options
Diffstat (limited to 'windriver')
| -rw-r--r-- | windriver/run.sh | 2 | ||||
| -rw-r--r-- | windriver/stop.sh | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/resource/tests/test_capacity.py | 14 | ||||
| -rw-r--r-- | windriver/titanium_cloud/urls.py | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/windriver/run.sh b/windriver/run.sh index 74aff7fa..650c2c1b 100644 --- a/windriver/run.sh +++ b/windriver/run.sh @@ -13,7 +13,7 @@ # 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 +memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid export PYTHONPATH=lib/share #nohup python manage.py runserver 0.0.0.0:9005 2>&1 & diff --git a/windriver/stop.sh b/windriver/stop.sh index ab8a72d5..5e7a6ac3 100644 --- a/windriver/stop.sh +++ b/windriver/stop.sh @@ -15,4 +15,4 @@ #ps auxww | grep 'manage.py runserver 0.0.0.0:9005' | awk '{print $2}' | xargs kill -9 ps auxww |grep 'uwsgi --http :9005 --module titanium_cloud.wsgi --master' |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 +ps auxww | grep 'memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9 diff --git a/windriver/titanium_cloud/resource/tests/test_capacity.py b/windriver/titanium_cloud/resource/tests/test_capacity.py index baca720f..82c453a2 100644 --- a/windriver/titanium_cloud/resource/tests/test_capacity.py +++ b/windriver/titanium_cloud/resource/tests/test_capacity.py @@ -144,7 +144,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": True}, response.data) + self.assertEqual({'AZs': [],"result": True}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -165,7 +165,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [],"result": False}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -187,7 +187,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [],"result": False}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -209,7 +209,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [],"result": False}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -231,7 +231,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [],"result": False}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -253,7 +253,7 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [], "result": False}, response.data) @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') @@ -275,4 +275,4 @@ class TestCapacity(test_base.TestRequest): HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) self.assertEquals(status.HTTP_200_OK, response.status_code) - self.assertEqual({"result": False}, response.data) + self.assertEqual({'AZs': [], "result": False}, response.data) diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py index 4d118dc2..a0537ddc 100644 --- a/windriver/titanium_cloud/urls.py +++ b/windriver/titanium_cloud/urls.py @@ -16,7 +16,7 @@ from django.conf.urls import include, url from starlingx_base.registration import registration from newton_base.openoapi import tenants -from newton_base.resource import capacity +from starlingx_base.resource import capacity from starlingx_base.resource import infra_workload urlpatterns = [ @@ -83,7 +83,7 @@ urlpatterns = [ r'infra_workload/?$', infra_workload.InfraWorkload.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' - r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]*)/?$', + r'infra_workload/(?P<workloadid>[0-9a-zA-Z_-]+)/?$', infra_workload.InfraWorkload.as_view()), url(r'^api/multicloud-titaniumcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/', include('titanium_cloud.proxy.urls')), @@ -122,7 +122,7 @@ urlpatterns = [ infra_workload.APIv1InfraWorkload.as_view()), url(r'^api/multicloud-titaniumcloud/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_-]*)/?$', + r'(?P<workloadid>[0-9a-zA-Z_-]+)/?$', infra_workload.APIv1InfraWorkload.as_view()), url(r'^api/multicloud-titaniumcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/' r'(?P<cloud_region_id>[0-9a-zA-Z_-]+)/', |