Fix bug of AZ cap check

Fix bugs in restcall module
update the status code of workload api
Remove unused event api from lenovo

Change-Id: Iaa16bc3aca42c4583408384c73802ff4debe1b19
Issue-ID: MULTICLOUD-542
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>

3 files changed, 0 insertions, 453 deletions

diff --git a/lenovo/thinkcloud/resource/tests/test_events.py b/lenovo/thinkcloud/resource/tests/test_events.py
deleted file mode 100644
index 5a363a4d..00000000
--- a/lenovo/thinkcloud/resource/tests/test_events.py
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright (c) 2017-2018 Lenovo 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import mock
-
-from rest_framework import status
-
-from newton_base.tests import mock_info
-from newton_base.tests import test_base
-from newton_base.util import VimDriverUtils
-
-MOCK_GET_SERVERS_DETAIL_RESPONSE = {
-    "servers": [
-        {
-            "accessIPv4": "",
-            "OS-EXT-SRV-ATTR:instance_name": "instance-0000000a",
-            "OS-SRV-USG:terminated_at": "",
-            "accessIPv6": "",
-            "config_drive": "",
-            "OS-DCF:diskConfig": "AUTO",
-            "updated": "2018-03-27T02:17:12Z",
-            "metadata": {},
-            "id": "12f5b1d0-fe5c-469f-a7d4-b62a91134bf8",
-            "flavor": {
-                "id": "60edb520-5826-4ae7-9e07-709b19ba6f39",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/flavors/60edb520-5826-4ae7-9e07-709b19ba6f39"
-                    }
-                ]
-            },
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://192.168.100.100:8774/v2.1/ad979139d5ea4a84b21b3620c0e4761e/servers/12f5b1d0-fe5c-469f-a7d4-b62a91134bf8"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/servers/12f5b1d0-fe5c-469f-a7d4-b62a91134bf8"
-                }
-            ],
-            "OS-EXT-SRV-ATTR:host": "compute-0",
-            "OS-EXT-AZ:availability_zone": "nova",
-            "name": "test1",
-            "wrs-res:pci_devices": "",
-            "hostId": "b3479a460f5effda10c6fdb860e824be631026c1d09f551479180577",
-            "user_id": "777155411f3042c9b7e3194188d6f85d",
-            "status": "PAUSED",
-            "OS-EXT-STS:power_state": 3,
-            "OS-EXT-SRV-ATTR:hypervisor_hostname": "compute-0",
-            "tenant_id": "ad979139d5ea4a84b21b3620c0e4761e",
-            "OS-SRV-USG:launched_at": "2018-03-27T02:16:40.000000",
-            "OS-EXT-STS:vm_state": "paused",
-            "wrs-if:nics": [
-                {
-                    "nic1": {
-                        "mac_address": "fa:16:3e:5f:1a:76",
-                        "network": "mgmt",
-                        "port_id": "6c225c23-abe3-42a8-8909-83471503d5d4",
-                        "vif_model": "virtio",
-                        "vif_pci_address": "",
-                        "mtu": 9216
-                    }
-                },
-                {
-                    "nic2": {
-                        "mac_address": "fa:16:3e:7c:7b:d7",
-                        "network": "data0",
-                        "port_id": "cbea2fec-c9b8-48ec-a964-0e3e255841bc",
-                        "vif_model": "virtio",
-                        "vif_pci_address": "",
-                        "mtu": 9216
-                    }
-                }
-            ],
-            "wrs-sg:server_group": "",
-            "OS-EXT-STS:task_state": "",
-            "wrs-res:topology": "node:0,  1024MB, pgsize:2M, 1s,1c,2t, vcpus:0,1, pcpus:5,21, siblings:{0,1}, pol:ded, thr:pre\nnode:1,  1024MB, pgsize:2M, 1s,1c,2t, vcpus:2,3, pcpus:8,24, siblings:{2,3}, pol:ded, thr:pre",
-            "wrs-res:vcpus": [4, 4, 4],
-            "key_name": "",
-            "image": {
-                "id": "7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/images/7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb"
-                    }
-                ]
-            },
-            "created": "2018-03-27T02:16:32Z",
-            "addresses": {
-                "data0": [
-                    {
-                        "OS-EXT-IPS:type": "fixed",
-                        "version": 4,
-                        "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:7c:7b:d7",
-                        "addr": "192.168.2.8"
-                    }
-                ],
-                "mgmt": [
-                    {
-                        "OS-EXT-IPS:type": "fixed",
-                        "version": 4,
-                        "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:5f:1a:76",
-                        "addr": "192.168.1.6"
-                    }
-                ]
-            },
-            "os-extended-volumes:volumes_attached": []
-        },
-        {
-            "accessIPv4": "",
-            "OS-EXT-SRV-ATTR:instance_name": "instance-00000009",
-            "OS-SRV-USG:terminated_at": "",
-            "accessIPv6": "",
-            "config_drive": "",
-            "OS-DCF:diskConfig": "AUTO",
-            "updated": "2018-03-27T02:12:21Z",
-            "metadata": {},
-            "id": "3f1b0375-a1db-4d94-b336-f32c82c0d7ec",
-            "flavor": {
-                "id": "0d3b1381-1626-4f6b-869b-4a4d5d42085e",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/flavors/0d3b1381-1626-4f6b-869b-4a4d5d42085e"
-                    }
-                ]
-            },
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://192.168.100.100:8774/v2.1/ad979139d5ea4a84b21b3620c0e4761e/servers/3f1b0375-a1db-4d94-b336-f32c82c0d7ec"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/servers/3f1b0375-a1db-4d94-b336-f32c82c0d7ec"
-                }
-            ],
-            "OS-EXT-SRV-ATTR:host": "compute-0",
-            "OS-EXT-AZ:availability_zone": "nova",
-            "name": "test2",
-            "wrs-res:pci_devices": "",
-            "hostId": "b3479a460f5effda10c6fdb860e824be631026c1d09f551479180577",
-            "user_id": "777155411f3042c9b7e3194188d6f85d",
-            "status": "ACTIVE",
-            "OS-EXT-STS:power_state": 1,
-            "OS-EXT-SRV-ATTR:hypervisor_hostname": "compute-0",
-            "tenant_id": "ad979139d5ea4a84b21b3620c0e4761e",
-            "OS-SRV-USG:launched_at": "2018-03-27T02:12:21.000000",
-            "OS-EXT-STS:vm_state": "active",
-            "wrs-if:nics": [
-                {
-                    "nic1": {
-                        "mac_address": "fa:16:3e:54:f8:a6",
-                        "network": "mgmt",
-                        "port_id": "30e2f51c-4473-4650-9ae9-a35e5d7ad452",
-                        "vif_model": "avp",
-                        "vif_pci_address": "",
-                        "mtu": 9216
-                    }
-                }
-            ],
-            "wrs-sg:server_group": "",
-            "OS-EXT-STS:task_state": "",
-            "wrs-res:topology": "node:0,  4096MB, pgsize:2M, 1s,3c,1t, vcpus:0-2, pcpus:4,20,7, pol:ded, thr:pre",
-            "progress": 0,
-            "wrs-res:vcpus": [3, 3, 3],
-            "key_name": "",
-            "image": {
-                "id": "7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/images/7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb"
-                    }
-                ]
-            },
-            "created": "2018-03-27T02:10:26Z",
-            "addresses": {
-                "mgmt": [
-                    {
-                        "OS-EXT-IPS:type": "fixed",
-                        "version": 4,
-                        "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:54:f8:a6",
-                        "addr": "192.168.1.11"
-                    }
-                ]
-            },
-            "os-extended-volumes:volumes_attached": []
-        },
-        {
-            "accessIPv4": "",
-            "OS-EXT-SRV-ATTR:instance_name": "instance-00000008",
-            "OS-SRV-USG:terminated_at": "",
-            "accessIPv6": "",
-            "config_drive": "",
-            "OS-DCF:diskConfig": "AUTO",
-            "updated": "2018-03-27T02:12:15Z",
-            "metadata": {},
-            "id": "1b6f6671-b680-42cd-89e9-fc4ddd5d2e02",
-            "flavor": {
-                "id": "0d3b1381-1626-4f6b-869b-4a4d5d42085e",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/flavors/0d3b1381-1626-4f6b-869b-4a4d5d42085e"
-                    }
-                ]
-            },
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://192.168.100.100:8774/v2.1/ad979139d5ea4a84b21b3620c0e4761e/servers/1b6f6671-b680-42cd-89e9-fc4ddd5d2e02"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/servers/1b6f6671-b680-42cd-89e9-fc4ddd5d2e02"
-                }
-            ],
-            "OS-EXT-SRV-ATTR:host": "compute-0",
-            "OS-EXT-AZ:availability_zone": "nova",
-            "name": "test3",
-            "wrs-res:pci_devices": "",
-            "hostId": "b3479a460f5effda10c6fdb860e824be631026c1d09f551479180577",
-            "user_id": "777155411f3042c9b7e3194188d6f85d",
-            "status": "ACTIVE",
-            "OS-EXT-STS:power_state": 1,
-            "OS-EXT-SRV-ATTR:hypervisor_hostname": "compute-0",
-            "tenant_id": "ad979139d5ea4a84b21b3620c0e4761e",
-            "OS-SRV-USG:launched_at": "2018-03-27T02:12:15.000000",
-            "OS-EXT-STS:vm_state": "active",
-            "wrs-if:nics": [
-                {
-                    "nic1": {
-                        "mac_address": "fa:16:3e:4e:9b:75",
-                        "network": "mgmt",
-                        "port_id": "72d13987-1d94-4a64-aa1a-973869ae1cad",
-                        "vif_model": "avp",
-                        "vif_pci_address": "",
-                        "mtu": 9216
-                    }
-                }
-            ],
-            "wrs-sg:server_group": "",
-            "OS-EXT-STS:task_state": "",
-            "wrs-res:topology": "node:0,  4096MB, pgsize:2M, 1s,3c,1t, vcpus:0-2, pcpus:19,3,22, pol:ded, thr:pre",
-            "progress": 0,
-            "wrs-res:vcpus": [3, 3, 3],
-            "key_name": "",
-            "image": {
-                "id": "7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb",
-                "links": [
-                    {
-                        "rel": "bookmark",
-                        "href": "http://192.168.100.100:8774/ad979139d5ea4a84b21b3620c0e4761e/images/7ba636ef-5dfd-4e67-ad32-cd23ee74e1eb"
-                    }
-                ]
-            },
-            "created": "2018-03-27T02:10:01Z",
-            "addresses": {
-                "mgmt": [
-                    {
-                        "OS-EXT-IPS:type": "fixed",
-                        "version": 4,
-                        "OS-EXT-IPS-MAC:mac_addr": "fa:16:3e:4e:9b:75",
-                        "addr": "192.168.1.8"
-                    }
-                ]
-            },
-            "os-extended-volumes:volumes_attached": []
-        }
-    ]
-}
-
-SUCCESS_VMSTATE_RESPONSE = {
-    'result': [
-        {
-            'name': 'test1',
-            'power_state': 3,
-            'id': '12f5b1d0-fe5c-469f-a7d4-b62a91134bf8',
-            'state': 'paused',
-            'tenant_id': 'ad979139d5ea4a84b21b3620c0e4761e',
-            'host': 'compute-0',
-            'availability_zone': 'nova',
-            'launched_at': '2018-03-27T02:16:40.000000'
-        },
-        {
-            'name': 'test2',
-            'power_state': 1,
-            'id': '3f1b0375-a1db-4d94-b336-f32c82c0d7ec',
-            'state': 'active',
-            'tenant_id': 'ad979139d5ea4a84b21b3620c0e4761e',
-            'host': 'compute-0',
-            'availability_zone': 'nova',
-            'launched_at': '2018-03-27T02:12:21.000000'
-        },
-        {
-            'name': 'test3',
-            'power_state': 1,
-            'id': '1b6f6671-b680-42cd-89e9-fc4ddd5d2e02',
-            'state': 'active',
-            'tenant_id': 'ad979139d5ea4a84b21b3620c0e4761e',
-            'host': 'compute-0',
-            'availability_zone': 'nova',
-            'launched_at': '2018-03-27T02:12:15.000000'
-        }
-    ]
-}
-
-
-class TestEvents(test_base.TestRequest):
-    def setUp(self):
-        super(TestEvents, self).setUp()
-
-    def _get_mock_response(self, return_value=None):
-        mock_response = mock.Mock(spec=test_base.MockResponse)
-        mock_response.status_code = status.HTTP_200_OK
-        mock_response.json.return_value = return_value
-        return mock_response
-
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_events_check_success(self, mock_get_vim_info, mock_get_session):
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get"], {
-                "side_effect": [
-                    self._get_mock_response(MOCK_GET_SERVERS_DETAIL_RESPONSE),
-                ]
-            })
-
-        response = self.client.post(
-            "/api/multicloud-thinkcloud/v0/lenovo-hudson-dc_RegionOne/events_check",
-            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
-
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEqual(SUCCESS_VMSTATE_RESPONSE, response.data)
diff --git a/lenovo/thinkcloud/resource/views/events.py b/lenovo/thinkcloud/resource/views/events.py
deleted file mode 100644
index ab706889..00000000
--- a/lenovo/thinkcloud/resource/views/events.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) 2017-2018 Lenovo 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import logging
-import traceback
-
-from common.exceptions import VimDriverNewtonException
-from newton_base.util import VimDriverUtils
-
-from keystoneauth1.exceptions import HttpError
-from rest_framework import status
-from rest_framework.response import Response
-from rest_framework.views import APIView
-from common.msapi import extsys
-
-
-logger = logging.getLogger(__name__)
-
-
-class EventsCheck(APIView):
-
-    def __init__(self):
-        self._logger = logger
-
-    def post(self, request, vimid=""):
-        self._logger.info("vimid, data> %s, %s" % (vimid, request.data))
-        self._logger.debug("META> %s" % request.META)
-
-        try:
-            tenant_name = None
-            vim = VimDriverUtils.get_vim_info(vimid)
-            sess = VimDriverUtils.get_session(vim, tenant_name)
-
-            # get token:
-            cloud_owner, regionid = extsys.decode_vim_id(vimid)
-            interface = 'public'
-            service = {
-                'service_type': 'compute',
-                'interface': interface,
-                'region_name': vim['openstack_region_id']
-                if vim.get('openstack_region_id')
-                else vim['cloud_region_id']
-            }
-
-            # get servers detail info
-            req_resouce = "/servers/detail"
-            self._logger.info("check servers detail> URI:%s" % req_resouce)
-            resp = sess.get(req_resouce, endpoint_filter=service)
-            self._logger.info("check servers detail> status:%s" % resp.status_code)
-            content = resp.json()
-            self._logger.debug("check servers detail> resp data:%s" % content)
-
-            # extract server status info
-            if len(content['servers']):
-                servers = content['servers']
-                resp_vmstate = []
-                for num in range(0, len(servers)):
-                    vmstate = {
-                        'name': servers[num]['name'],
-                        'state': servers[num]['OS-EXT-STS:vm_state'],
-                        'power_state': servers[num]['OS-EXT-STS:power_state'],
-                        'launched_at': servers[num]['OS-SRV-USG:launched_at'],
-                        'id': servers[num]['id'],
-                        'host': servers[num]['OS-EXT-SRV-ATTR:host'],
-                        'availability_zone': servers[num]['OS-EXT-AZ:availability_zone'],
-                        'tenant_id': servers[num]['tenant_id']
-                    }
-
-                    resp_vmstate.append(vmstate)
-
-            self._logger.info("RESP with data> result:%s" % resp_vmstate)
-            return Response(data={'result': resp_vmstate}, status=status.HTTP_200_OK)
-
-        except VimDriverNewtonException as e:
-            self._logger.error("Plugin exception> status:%s,error:%s" %
-                               (e.status_code, e.content))
-            return Response(data={'result': resp_vmstate, 'error': e.content}, status=e.status_code)
-
-        except HttpError as e:
-            self._logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json()))
-            resp = e.response.json()
-            resp.update({'result': resp_vmstate})
-            return Response(data=e.response.json(), status=e.http_status)
-
-        except Exception as e:
-            self._logger.error(traceback.format_exc())
-            return Response(data={'result': resp_vmstate, 'error': str(e)},
-                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
diff --git a/lenovo/thinkcloud/urls.py b/lenovo/thinkcloud/urls.py
index 1828bb33..9559b906 100644
--- a/lenovo/thinkcloud/urls.py
+++ b/lenovo/thinkcloud/urls.py
@@ -17,7 +17,6 @@ from django.conf.urls import include, url
 from thinkcloud.registration.views import registration
 from newton_base.openoapi import tenants
 from thinkcloud.resource.views import capacity
-from thinkcloud.resource.views import events
 from thinkcloud.resource.views import infra_workload
 
 urlpatterns = [
@@ -42,9 +41,6 @@ urlpatterns = [
     # CapacityCheck
     url(r'^api/multicloud-thinkcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/capacity_check/?$',
         capacity.CapacityCheck.as_view()),
-    # events
-    url(r'^api/multicloud-thinkcloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/events_check/?$',
-        events.EventsCheck.as_view()),
 
     # API upgrading
     url(r'^api/multicloud-thinkcloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry$',