Agent: delete unused host.get_http_ticket api

Change-Id: Ibec06d11bc90c37ceeac27e1d5e31d5fe5c700bd

Author: longzhou

python/src/host/host/host_handler.py

@@ -72,8 +72,6 @@
 from gen.host.ttypes import GetVmNetworkResultCode
 from gen.host.ttypes import HostConfig
 from gen.host.ttypes import HostMode
-from gen.host.ttypes import HttpTicketResponse
-from gen.host.ttypes import HttpTicketResultCode
 from gen.host.ttypes import MksTicketResponse
 from gen.host.ttypes import MksTicketResultCode
 from gen.host.ttypes import PowerVmOp
@@ -1511,28 +1509,6 @@ def get_service_ticket(self, request):
                 ServiceTicketResultCode.BAD_REQUEST,
                 "Operation not supported")
 
-    @log_request
-    @error_handler(HttpTicketResponse, HttpTicketResultCode)
-    def get_http_ticket(self, request):
-        """ Get HTTP CGI ticket from host.
-
-        The ticket returned is only for performing the requested HTTP
-        operation on the specified URL.
-
-        :param request: HttpTicketRequest
-        :return: HttpTicketResponse
-        """
-        try:
-            ticket = self.hypervisor.acquire_cgi_ticket(request.url,
-                                                        request.op)
-            return HttpTicketResponse(HttpTicketResultCode.OK,
-                                      ticket=ticket)
-        except:
-            return self._error_response(
-                HttpTicketResultCode.SYSTEM_ERROR,
-                str(sys.exc_info()[1]),
-                HttpTicketResponse())
-
     @log_request
     @error_handler(MksTicketResponse, MksTicketResultCode)
     def get_mks_ticket(self, request):

python/src/host/host/hypervisor/esx/http_disk_transfer.py

@@ -24,9 +24,6 @@
 from common.photon_thrift.direct_client import DirectClient
 from common.lock import lock_non_blocking
 from gen.host import Host
-from gen.host.ttypes import HttpTicketRequest
-from gen.host.ttypes import HttpTicketResultCode
-from gen.host.ttypes import HttpOp
 from gen.host.ttypes import PrepareReceiveImageRequest
 from gen.host.ttypes import PrepareReceiveImageResultCode
 from gen.host.ttypes import ReceiveImageRequest
@@ -127,15 +124,6 @@ def _get_response_data(self, src, read_lease):
                                    (CHUNK_SIZE * counter // (1024 * 1024), progress))
             data = src.read(CHUNK_SIZE)
 
-    def _get_cgi_ticket(self, host, port, url, http_op=HttpOp.GET):
-        client = DirectClient("Host", Host.Client, host, port)
-        client.connect()
-        request = HttpTicketRequest(op=http_op, url="%s" % url)
-        response = client.get_http_ticket(request)
-        if response.result != HttpTicketResultCode.OK:
-            raise ValueError("No ticket")
-        return response.ticket
-
     def upload_stream(self, source_file_obj, file_size, url, write_lease, ticket):
         protocol, host, selector = self._split_url(url)
         self._logger.debug("Upload file of size: %d\nTo URL:\n%s://%s%s\n" %

python/src/host/host/hypervisor/esx/hypervisor.py

@@ -72,9 +72,6 @@ def check_image(self, image_id, datastore_id):
     def acquire_vim_ticket(self):
         return self.vim_client.acquire_clone_ticket()
 
-    def acquire_cgi_ticket(self, url, op):
-        return self.vim_client.acquire_cgi_ticket(url, op)
-
     def add_update_listener(self, listener):
         self.vim_client.add_update_listener(listener)
 

python/src/host/host/hypervisor/esx/vim_client.py

@@ -43,7 +43,6 @@
 from host.hypervisor.vm_manager import VmNotFoundException
 from host.hypervisor.esx import logging_wrappers
 from gen.agent.ttypes import VmCache, PowerState, TaskState
-from gen.host.ttypes import HttpOp
 
 # constants from bora/vim/hostd/private/hostdCommon.h
 HA_DATACENTER_ID = "ha-datacenter"
@@ -424,25 +423,6 @@ def acquire_clone_ticket(self):
         """
         return self.session_manager.AcquireCloneTicket()
 
-    @hostd_error_handler
-    def acquire_cgi_ticket(self, url, op):
-        """
-        acquire a cgi ticket to perform a HTTP operation on a URL
-        :return: str, ticket
-        """
-        http_method = vim.SessionManager.HttpServiceRequestSpec.Method
-        _op_map = {
-            HttpOp.GET: http_method.httpGet,
-            HttpOp.PUT: http_method.httpPut,
-            HttpOp.POST: http_method.httpPost
-        }
-
-        httpsvc_spec = vim.SessionManager.HttpServiceRequestSpec()
-        httpsvc_spec.url = url
-        httpsvc_spec.method = _op_map[op]
-        ticket = self.session_manager.AcquireGenericServiceTicket(httpsvc_spec)
-        return ticket.id
-
     @hostd_error_handler
     def inventory_path(self, *path):
         """

python/src/host/host/hypervisor/fake/hypervisor.py

@@ -72,9 +72,6 @@ def acquire_vim_ticket(self):
         return 'cst-526d7e8f-b126-1686-9b49-bde6f34f0be8--tp-71-18-5C-87' + \
             '-F9-DB-C1-B9-D7-92-7A-19-99-1E-45-56-73-D6-CC-99'
 
-    def acquire_cgi_ticket(self, url, op):
-        return '52524918-2252-f24d-3a2b-2609c0fe795e'
-
     def add_update_listener(self, listener):
         # Only triggers VM update listener
         self.vm_manager.add_update_listener(listener)

python/src/host/host/hypervisor/hypervisor.py

@@ -143,9 +143,6 @@ def cpu_overcommit(self):
     def set_cpu_overcommit(self, value):
         self.placement_manager.cpu_overcommit = value
 
-    def acquire_cgi_ticket(self, url, op):
-        return self.hypervisor.acquire_cgi_ticket(url, op)
-
     def transfer_image(self, source_image_id, source_datastore,
                        destination_image_id, destination_datastore,
                        host, port):

python/src/host/host/tests/integration/test_http_transfer.py

@@ -10,22 +10,19 @@
 # License for then specific language governing permissions and limitations
 # under the License.
 
-import filecmp
 import logging
 import os
 import re
 import tempfile
 import unittest
 
 from hamcrest import *  # noqa
-from mock import patch, MagicMock
+from mock import patch
 from nose.plugins.skip import SkipTest
 from testconfig import config
 
-from gen.host.ttypes import HttpOp
 from host.hypervisor.esx.vim_client import VimClient
 from host.hypervisor.esx.http_disk_transfer import HttpNfcTransferer
-from host.hypervisor.esx.http_disk_transfer import TransferException
 
 
 class TestHttpTransfer(unittest.TestCase):
@@ -78,47 +75,6 @@ def _datastore_path_url(self, datastore, relpath):
             self.host, relpath, quoted_dc_name, datastore)
         return url
 
-    def test_download_missing_file(self):
-        url = self._datastore_path_url(self.image_datastore,
-                                       "_missing_file_.bin")
-        ticket = self.http_transferer._get_cgi_ticket(
-            self.host, self.agent_port, url, http_op=HttpOp.GET)
-        with tempfile.NamedTemporaryFile(delete=True) as local_file:
-            self.assertRaises(TransferException,
-                              self.http_transferer.download_file, url,
-                              local_file.name, MagicMock(), ticket=ticket)
-
-    def test_upload_file_bad_destination(self):
-        url = self._datastore_path_url("_missing__datastore_",
-                                       "random.bin")
-        ticket = self.http_transferer._get_cgi_ticket(
-            self.host, self.agent_port, url, http_op=HttpOp.PUT)
-        self.assertRaises(
-            TransferException, self.http_transferer.upload_file,
-            self.random_file, url, MagicMock(), ticket=ticket)
-
-    def test_raw_file_transfer_roundtrip(self):
-        relpath = "_test_http_xfer_random.bin"
-        url = self._datastore_path_url(self.image_datastore, relpath)
-        ticket = self.http_transferer._get_cgi_ticket(
-            self.host, self.agent_port, url, http_op=HttpOp.PUT)
-        self.http_transferer.upload_file(self.random_file, url, MagicMock(), ticket=ticket)
-
-        self.remote_files_to_delete.append(
-            self._remote_ds_path(self.image_datastore, relpath))
-
-        ticket = self.http_transferer._get_cgi_ticket(
-            self.host, self.agent_port, url, http_op=HttpOp.GET)
-        with tempfile.NamedTemporaryFile(delete=True) as downloaded_file:
-            self.http_transferer.download_file(url, downloaded_file.name,
-                                               MagicMock(), ticket=ticket)
-            # check that file uploaded and immediately downloaded back is
-            # identical to the source file used.
-            assert_that(
-                filecmp.cmp(self.random_file, downloaded_file.name,
-                            shallow=False),
-                is_(True))
-
     @patch('os.path.exists', return_value=True)
     def test_get_streamoptimized_image_stream(self, _exists):
         image_id = "ttylinux"

python/src/host/host/tests/integration/test_vim_client.py

@@ -14,15 +14,13 @@
 import random
 import time
 import unittest
-import uuid
 
 from hamcrest import *  # noqa
 from mock import MagicMock
 from nose.plugins.skip import SkipTest
 from testconfig import config
 
 from gen.agent.ttypes import PowerState
-from gen.host.ttypes import HttpOp
 from host.hypervisor.esx.vim_client import VimClient
 from host.hypervisor.esx.vm_config import EsxVmConfig
 from host.hypervisor.vm_manager import VmNotFoundException
@@ -268,16 +266,6 @@ def test_clone_ticket(self):
         vim_client2 = VimClient(host=self.host, ticket=ticket)
         vim_client2.host_system
 
-    def test_http_ticket(self):
-        datastore = self.vim_client.get_datastore().name
-        filename = "%s.bin" % str(uuid.uuid4())
-        quoted_dc_name = 'ha%252ddatacenter'
-        url = 'https://%s/folder/%s?dcPath=%s&dsName=%s' % (
-            self.host, filename, quoted_dc_name, datastore)
-
-        ticket = self.vim_client.acquire_cgi_ticket(url, HttpOp.PUT)
-        assert_that(ticket, is_not(equal_to(None)))
-
     def test_host_stats(self):
         """ Skip host stats test.
         This test does not agree with the contract exposed from

thrift/host.thrift

@@ -853,33 +853,6 @@ struct MksTicketResponse {
   3: optional resource.MksTicket ticket
 }
 
-enum HttpOp {
-  GET = 0
-  PUT = 1
-  POST = 2
-}
-
-struct HttpTicketRequest {
-  // URL to host resource to access via HTTP CGI
-  1: required string url
-
-  // The operation to perform on the URL
-  2: required HttpOp op
-
-  99: optional tracing.TracingInfo tracing_info
-}
-
-enum HttpTicketResultCode {
-  OK = 0
-  SYSTEM_ERROR = 1
-}
-
-struct HttpTicketResponse {
-  1: required HttpTicketResultCode result
-  2: optional string error
-  3: optional string ticket
-}
-
 struct GetDatastoresRequest {
   99: optional tracing.TracingInfo tracing_info
 }
@@ -958,7 +931,6 @@ service Host {
 
   ServiceTicketResponse get_service_ticket(1: ServiceTicketRequest request)
   MksTicketResponse get_mks_ticket(1: MksTicketRequest request)
-  HttpTicketResponse get_http_ticket(1: HttpTicketRequest request)
 
   scheduler.PlaceResponse place(1: scheduler.PlaceRequest request)