Merge pull request #2 from jkrivas/feature/first_available_subnet

Added functions to get/create first free available subnets using /api/my_app/subnets/{id}/first_subnet/{mask}/ API method

Author: pavel-z1

controllers/subnets/subnets.go

@@ -117,6 +117,12 @@ func (c *Controller) CreateSubnet(in Subnet) (message string, err error) {
 	return
 }
 
+// CreateFirstFreeSubnet creates a first free child subnet inside subnet with specified mask by sending a POST request.
+func (c *Controller) CreateFirstFreeSubnet(id int, mask int, in Subnet) (message string, err error) {
+	err = c.SendRequest("POST", fmt.Sprintf("/subnets/%d/first_subnet/%d/", id, mask), &in, &message)
+	return
+}
+
 // GetSubnetByID GETs a subnet via its ID.
 func (c *Controller) GetSubnetByID(id int) (out Subnet, err error) {
 	err = c.SendRequest("GET", fmt.Sprintf("/subnets/%d/", id), &struct{}{}, &out)
@@ -135,6 +141,12 @@ func (c *Controller) GetSubnetsByCIDR(cidr string) (out []Subnet, err error) {
 	return
 }
 
+// GetFirstFreeSubnet GETs the first free child subnet inside subnet with specified mask
+func (c *Controller) GetFirstFreeSubnet(id int, mask int) (message string, err error) {
+	err = c.SendRequest("GET", fmt.Sprintf("/subnets/%d/first_subnet/%d/", id, mask), &struct{}{}, &message)
+	return
+}
+
 // GetFirstFreeAddress GETs the first free IP address in a subnet and returns
 // it as a string. This can be used to automatically determine the next address
 // you should use. If there are no more available addresses, the string will be

controllers/subnets/subnets_test.go

@@ -31,6 +31,21 @@ const testCreateSubnetOutputJSON = `
 }
 `
 
+var testCreateFirstFreeSubnetInput = Subnet{
+	Description: "Subnet1",
+}
+
+const testCreateFirstFreeSubnetOutputExpected = "10.10.4.0/25"
+const testCreateFirstFreeSubnetOutputJSON = `
+{
+  "code": 201,
+  "success": true,
+  "message": "Subnet created",
+  "id": "10",
+  "data": "10.10.4.0/25"
+}
+`
+
 var testGetSubnetByIDOutputExpected = Subnet{
 	ID:             8,
 	SubnetAddress:  "10.10.3.0",
@@ -189,6 +204,15 @@ const testGetSubnetsByCIDROutputJSON = `
 }
 `
 
+const testGetFirstFreeSubnetOutputExpected = "10.10.4.0/25"
+const testGetFirstFreeSubnetOutputJSON = `
+{
+  "code": 200,
+  "success": true,
+  "data": "10.10.4.0/25"
+}
+`
+
 const testGetFirstFreeAddressOutputExpected = "10.10.1.1"
 const testGetFirstFreeAddressOutputJSON = `
 {
@@ -503,6 +527,27 @@ func TestCreateSubnet(t *testing.T) {
 	}
 }
 
+func TestCreateFirstFreeSubnet(t *testing.T){
+	ts := httpCreatedTestServer(testCreateFirstFreeSubnetOutputJSON)
+	defer ts.Close()
+	sess := fullSessionConfig()
+	sess.Config.Endpoint = ts.URL
+	client := NewController(sess)
+
+	in := testCreateFirstFreeSubnetInput
+	mask := 25
+	id := 2
+	expected := testCreateFirstFreeSubnetOutputExpected
+	actual, err := client.CreateFirstFreeSubnet(id, mask, in)
+	if err != nil {
+		t.Fatalf("Bad: %s", err)
+	}
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Fatalf("Expected %#v, got %#v", expected, actual)
+	}
+}
+
 func TestGetSubnetByID(t *testing.T) {
 	ts := httpOKTestServer(testGetSubnetByIDOutputJSON)
 	defer ts.Close()
@@ -539,6 +584,26 @@ func TestGetSubnetsByCIDR(t *testing.T) {
 	}
 }
 
+func TestGetFirstFreeSubnet(t *testing.T) {
+	ts := httpOKTestServer(testGetFirstFreeSubnetOutputJSON)
+	defer ts.Close()
+	sess := fullSessionConfig()
+	sess.Config.Endpoint = ts.URL
+	client := NewController(sess)
+
+	id := 2
+	mask := 25
+	expected := testGetFirstFreeSubnetOutputExpected
+	actual, err := client.GetFirstFreeSubnet(id, mask)
+	if err != nil {
+		t.Fatalf("Bad: %s", err)
+	}
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Fatalf("Expected %#v, got %#v", expected, actual)
+	}
+}
+
 func TestGetFirstFreeAddress(t *testing.T) {
 	ts := httpOKTestServer(testGetFirstFreeAddressOutputJSON)
 	defer ts.Close()