diff options
author | xinhuili <lxinhui@vmware.com> | 2017-12-26 03:35:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-26 03:35:37 +0000 |
commit | c64362ffec199839485b89dc0265e69f7d7e7466 (patch) | |
tree | 2f45c0ae5d5e84bce5e3426bd83cb3d24b28590c /multivimbroker | |
parent | 1ab719d0d310b0c0640eeeb4d1cf87dcae4c3168 (diff) | |
parent | 610a861084ead12a1f39f1cd836d29387d5b7a74 (diff) |
Merge "Remove sample folder in code"
Diffstat (limited to 'multivimbroker')
-rw-r--r-- | multivimbroker/multivimbroker/samples/__init__.py | 10 | ||||
-rw-r--r-- | multivimbroker/multivimbroker/samples/tests.py | 30 | ||||
-rw-r--r-- | multivimbroker/multivimbroker/samples/urls.py | 16 | ||||
-rw-r--r-- | multivimbroker/multivimbroker/samples/views.py | 26 | ||||
-rw-r--r-- | multivimbroker/multivimbroker/urls.py | 1 |
5 files changed, 0 insertions, 83 deletions
diff --git a/multivimbroker/multivimbroker/samples/__init__.py b/multivimbroker/multivimbroker/samples/__init__.py deleted file mode 100644 index 802f3fb..0000000 --- a/multivimbroker/multivimbroker/samples/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2017 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 -# -# 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. diff --git a/multivimbroker/multivimbroker/samples/tests.py b/multivimbroker/multivimbroker/samples/tests.py deleted file mode 100644 index 25850c9..0000000 --- a/multivimbroker/multivimbroker/samples/tests.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2017 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 -# -# 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. - -import unittest -import json -from django.test import Client -from rest_framework import status - - -class SampleViewTest(unittest.TestCase): - def setUp(self): - self.client = Client() - - def tearDown(self): - pass - - def test_sample(self): - response = self.client.get("/samples/") - self.assertEqual(status.HTTP_200_OK, - response.status_code, response.content) - resp_data = json.loads(response.content) - self.assertEqual({"status": "active"}, resp_data) diff --git a/multivimbroker/multivimbroker/samples/urls.py b/multivimbroker/multivimbroker/samples/urls.py deleted file mode 100644 index 71ffa88..0000000 --- a/multivimbroker/multivimbroker/samples/urls.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2017 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 -# -# 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. - -from django.conf.urls import url -from multivimbroker.samples import views - -urlpatterns = [ - url(r'^samples/$', views.SampleList.as_view()), ] diff --git a/multivimbroker/multivimbroker/samples/views.py b/multivimbroker/multivimbroker/samples/views.py deleted file mode 100644 index e51044a..0000000 --- a/multivimbroker/multivimbroker/samples/views.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2017 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 -# -# 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. - -import logging - -from rest_framework.views import APIView -from rest_framework.response import Response - -logger = logging.getLogger(__name__) - - -class SampleList(APIView): - """ - List all samples. - """ - def get(self, request, format=None): - logger.debug("get") - return Response({"status": "active"}) diff --git a/multivimbroker/multivimbroker/urls.py b/multivimbroker/multivimbroker/urls.py index 7619e5a..de2ef49 100644 --- a/multivimbroker/multivimbroker/urls.py +++ b/multivimbroker/multivimbroker/urls.py @@ -17,7 +17,6 @@ from multivimbroker.pub.config import config urlpatterns = [ url(r'^', include('multivimbroker.swagger.urls')), - url(r'^', include('multivimbroker.samples.urls')), url(r'^', include('multivimbroker.forwarder.urls')), ] |