Vpnaas: Delete service (#769)

* Added delete request

* Added delete result

* added unit and acceptance tests for delete function

* added delete Service to acceptancetest

* Added documentation in doc.go file

acceptance/openstack/networking/v2/extensions/vpnaas/service_test.go

@@ -26,6 +26,7 @@ func TestServiceCRUD(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unable to create service: %v", err)
 	}
+	defer DeleteService(t, client, service.ID)
 
 	tools.PrintResource(t, service)
 }

acceptance/openstack/networking/v2/extensions/vpnaas/vpnaas.go

@@ -30,3 +30,17 @@ func CreateService(t *testing.T, client *gophercloud.ServiceClient, routerID str
 
 	return service, nil
 }
+
+// DeleteService will delete a service with a specified ID. A fatal error
+// will occur if the delete was not successful. This works best when used as
+// a deferred function.
+func DeleteService(t *testing.T, client *gophercloud.ServiceClient, serviceID string) {
+	t.Logf("Attempting to delete service: %s", serviceID)
+
+	err := services.Delete(client, serviceID).ExtractErr()
+	if err != nil {
+		t.Fatalf("Unable to delete service %s: %v", serviceID, err)
+	}
+
+	t.Logf("Service deleted: %s", serviceID)
+}

openstack/networking/v2/extensions/vpnaas/services/doc.go

@@ -17,5 +17,13 @@ Example to Create a Service
 		panic(err)
 	}
 
+Example to Delete a Service
+
+	serviceID := "38aee955-6283-4279-b091-8b9c828000ec"
+	err := policies.Delete(networkClient, serviceID).ExtractErr()
+	if err != nil {
+		panic(err)
+	}
+
 */
 package services

openstack/networking/v2/extensions/vpnaas/services/requests.go

@@ -50,3 +50,10 @@ func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResul
 	_, r.Err = c.Post(rootURL(c), b, &r.Body, nil)
 	return
 }
+
+// Delete will permanently delete a particular VPN service based on its
+// unique ID.
+func Delete(c *gophercloud.ServiceClient, id string) (r DeleteResult) {
+	_, r.Err = c.Delete(resourceURL(c, id), nil)
+	return
+}

openstack/networking/v2/extensions/vpnaas/services/results.go

@@ -60,3 +60,9 @@ func (r commonResult) Extract() (*Service, error) {
 type CreateResult struct {
 	commonResult
 }
+
+// DeleteResult represents the result of a delete operation. Call its
+// ExtractErr method to determine if the operation succeeded or failed.
+type DeleteResult struct {
+	gophercloud.ErrResult
+}

openstack/networking/v2/extensions/vpnaas/services/testing/requests_test.go

@@ -75,3 +75,17 @@ func TestCreate(t *testing.T) {
 	}
 	th.AssertDeepEquals(t, expected, *actual)
 }
+
+func TestDelete(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+
+	th.Mux.HandleFunc("/v2.0/vpn/vpnservices/5c561d9d-eaea-45f6-ae3e-08d1a7080828", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
+		w.WriteHeader(http.StatusNoContent)
+	})
+
+	res := services.Delete(fake.ServiceClient(), "5c561d9d-eaea-45f6-ae3e-08d1a7080828")
+	th.AssertNoErr(t, res.Err)
+}