Implement service deletion

Service deletion is working from magnum api.

Change-Id: Ifbd10246682dda32bb28bbc1d640ff365d53495d

magnum/api/controllers/v1/service.py

@@ -338,6 +338,4 @@ class ServicesController(rest.RestController):
         if self.from_services:
             raise exception.OperationNotPermitted
 
-        rpc_service = objects.Service.get_by_uuid(pecan.request.context,
-                                                  service_uuid)
-        pecan.request.rpcapi.service_delete(rpc_service)
+        pecan.request.rpcapi.service_delete(service_uuid)

magnum/conductor/api.py

@@ -68,8 +68,8 @@ class API(rpc_service.API):
         # or figure out a clean way to interact with k8s.
         return objects.Service.list(context, limit, marker, sort_key, sort_dir)
 
-    def service_delete(self, service):
-        return self._call('service_delete', service=service)
+    def service_delete(self, uuid):
+        return self._call('service_delete', uuid=uuid)
 
     def service_show(self, ctxt, uuid):
         return objects.Service.get_by_uuid(ctxt, uuid)

magnum/conductor/handlers/common/kube_utils.py

@@ -129,18 +129,18 @@ class KubeClient(object):
             LOG.error("Couldn't get list of services due to error %s" % e)
             return None
 
-    def service_delete(self, master_address, uuid):
-        LOG.debug("service_delete %s" % uuid)
+    def service_delete(self, master_address, name):
+        LOG.debug("service_delete %s" % name)
         try:
-            out, err = utils.trycmd('kubectl', 'delete', 'service', uuid,
+            out, err = utils.trycmd('kubectl', 'delete', 'service', name,
                                     '-s', master_address)
             if err:
                 return False
         except Exception as e:
             LOG.error("Couldn't delete service %s due to error %s"
-                      % (uuid, e))
-            return False
+                      % (name, e))
             return False
+        return True
 
     def service_get(self, master_address, uuid):
         LOG.debug("service_get %s" % uuid)

magnum/conductor/handlers/kube.py

@@ -98,10 +98,12 @@ class Handler(object):
         LOG.debug("service_list")
         return self.kube_cli.service_list()
 
-    def service_delete(self, ctxt, service):
+    def service_delete(self, ctxt, uuid):
         LOG.debug("service_delete")
+        service = objects.Service.get_by_uuid(ctxt, uuid)
+        k8s_master_url = _retrive_k8s_master_url(ctxt, service)
         # trigger a kubectl command
-        status = self.kube_cli.service_delete(service.uuid)
+        status = self.kube_cli.service_delete(k8s_master_url, service.name)
         if not status:
             return None
         # call the service object to persist in db

magnum/tests/api/controllers/v1/test_service.py

@@ -10,6 +10,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 from magnum.conductor import api
+from magnum import objects
 from magnum.tests.db import base as db_base
 
 from mock import patch
@@ -21,7 +22,8 @@ class TestServiceController(db_base.DbTestCase):
         service.create()
         return service
 
-    def mock_service_destroy(self, service):
+    def mock_service_destroy(self, uuid):
+        service = objects.Service.get_by_uuid({}, uuid)
         service.destroy()
 
     def test_service_api(self):

magnum/tests/conductor/test_rpcapi.py

@@ -89,12 +89,11 @@ class RPCAPITestCase(base.DbTestCase):
                           version='1.0',
                           service=self.fake_service)
 
-    # TODO(sdake) the parameters to delete operations are highly suspect
     def test_service_delete(self):
         self._test_rpcapi('service_delete',
                           'call',
                           version='1.0',
-                          service=self.fake_service)
+                          uuid=self.fake_service['uuid'])
 
     def test_pod_create(self):
         self._test_rpcapi('pod_create',