From e9020112cd108f48af2b2c1144b4c27f6c73f943 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Wed, 7 Aug 2019 09:19:12 +0300 Subject: [PATCH] NSX|V: Remove unused VCNS apis Trivial-Fix Change-Id: Ieb996585a6c301d4a20593a656a9bfc807d98d0c --- vmware_nsx/plugins/nsx_v/vshield/vcns.py | 13 ------------ .../tests/unit/nsx_v/vshield/fake_vcns.py | 20 ------------------- .../unit/nsx_v/vshield/test_vcns_driver.py | 2 -- 3 files changed, 35 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v/vshield/vcns.py b/vmware_nsx/plugins/nsx_v/vshield/vcns.py index c26ae7f398..f0187d0164 100644 --- a/vmware_nsx/plugins/nsx_v/vshield/vcns.py +++ b/vmware_nsx/plugins/nsx_v/vshield/vcns.py @@ -186,14 +186,6 @@ class Vcns(object): uri = URI_PREFIX + "/jobs/%s" % job_id return self.do_request(HTTP_GET, uri, decode=True) - def get_edge_jobs(self, edge_id): - uri = URI_PREFIX + "/%s/jobs" % edge_id - return self.do_request(HTTP_GET, uri, decode=True) - - def get_edge_deploy_status(self, edge_id): - uri = URI_PREFIX + "/%s/status?getlatest=false" % edge_id - return self.do_request(HTTP_GET, uri, decode="True") - def delete_edge(self, edge_id): uri = "%s/%s" % (URI_PREFIX, edge_id) return self.do_request(HTTP_DELETE, uri) @@ -762,11 +754,6 @@ class Vcns(object): } return self.do_request(HTTP_PUT, uri, payload, decode=True) - def get_system_control(self, edge_id): - uri = self._build_uri_path(edge_id, SYSCTL_SERVICE) - - return self.do_request(HTTP_GET, uri) - def _get_enforcement_point_body(self, enforcement_points): e_point_list = [] for enforcement_point in enforcement_points: diff --git a/vmware_nsx/tests/unit/nsx_v/vshield/fake_vcns.py b/vmware_nsx/tests/unit/nsx_v/vshield/fake_vcns.py index 5967861cfb..11e8dae199 100644 --- a/vmware_nsx/tests/unit/nsx_v/vshield/fake_vcns.py +++ b/vmware_nsx/tests/unit/nsx_v/vshield/fake_vcns.py @@ -84,15 +84,6 @@ class FakeVcns(object): return False return True - def get_edge_jobs(self, edge_id): - if edge_id not in self._edges: - raise Exception(_("Edge %s does not exist") % edge_id) - header = { - 'status': 200 - } - response = {"edgeJob": []} - return (header, response) - def deploy_edge(self, request): if (self._unique_router_name and not self._validate_edge_name(request['name'])): @@ -149,17 +140,6 @@ class FakeVcns(object): } return (header, response) - def get_edge_deploy_status(self, edge_id): - if edge_id not in self._edges: - raise Exception(_("Edge %s does not exist") % edge_id) - header = { - 'status': 200, - } - response = { - 'systemStatus': 'good' - } - return (header, response) - def delete_edge(self, edge_id): if edge_id not in self._edges: raise Exception(_("Edge %s does not exist") % edge_id) diff --git a/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py b/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py index b23c14cadf..318f1afba0 100644 --- a/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py +++ b/vmware_nsx/tests/unit/nsx_v/vshield/test_vcns_driver.py @@ -295,8 +295,6 @@ class VcnsDriverTestCase(base.BaseTestCase): instance = self.mock_vcns.start() instance.return_value.deploy_edge.side_effect = self.fc.deploy_edge instance.return_value.get_edge_id.side_effect = self.fc.get_edge_id - instance.return_value.get_edge_deploy_status.side_effect = ( - self.fc.get_edge_deploy_status) instance.return_value.delete_edge.side_effect = self.fc.delete_edge instance.return_value.update_interface.side_effect = ( self.fc.update_interface)