From 0e521f496b253d5c40c29bd514620ca280844d5a Mon Sep 17 00:00:00 2001 From: disha-wani Date: Mon, 30 Jul 2018 12:17:08 +0530 Subject: [PATCH] add Subnet Id parameter --- openstack/networking/v1/subnets/results.go | 3 +++ .../v1/subnets/testing/requests_test.go | 20 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/openstack/networking/v1/subnets/results.go b/openstack/networking/v1/subnets/results.go index bf0097955..50a86a3cb 100644 --- a/openstack/networking/v1/subnets/results.go +++ b/openstack/networking/v1/subnets/results.go @@ -39,6 +39,9 @@ type Subnet struct { //Specifies the ID of the VPC to which the subnet belongs. VPC_ID string `json:"vpc_id"` + + //Specifies the subnet ID. + SubnetId string `json:"neutron_subnet_id"` } // SubnetPage is the page returned by a pager when traversing over a diff --git a/openstack/networking/v1/subnets/testing/requests_test.go b/openstack/networking/v1/subnets/testing/requests_test.go index 41d6b296c..76c4fb7c6 100644 --- a/openstack/networking/v1/subnets/testing/requests_test.go +++ b/openstack/networking/v1/subnets/testing/requests_test.go @@ -25,7 +25,7 @@ func TestListSubnet(t *testing.T) { { "subnets": [ { - "id": "134ca339-24dc-44f5-ae6a-cf0404216ed2", + "id": "0345a6ef-9404-487b-87c8-212557a1160d", "name": "openlab-subnet", "cidr": "192.168.200.0/24", "status": "ACTIVE", @@ -37,7 +37,8 @@ func TestListSubnet(t *testing.T) { "dnsList": [ "114.114.114.114", "114.114.115.115" - ] + ], + "neutron_subnet_id": "3d543273-31c3-41f8-b887-ed8c2c837578" }, { "id": "134ca339-24dc-44f5-ae6a-cf0404216ed2", @@ -52,7 +53,8 @@ func TestListSubnet(t *testing.T) { "dnsList": [ "114.114.114.114", "114.114.115.115" - ] + ], + "neutron_subnet_id": "3d543273-31c3-41f8-b887-ed8c2c837578" } ] } @@ -72,12 +74,13 @@ func TestListSubnet(t *testing.T) { EnableDHCP: true, Name: "openlab-subnet", //DnsList: []string{}, - ID: "134ca339-24dc-44f5-ae6a-cf0404216ed2", + ID: "0345a6ef-9404-487b-87c8-212557a1160d", GatewayIP: "192.168.200.1", VPC_ID: "58c24204-170e-4ff0-9b42-c53cdea9239a", PRIMARY_DNS: "114.114.114.114", SECONDARY_DNS: "114.114.115.115", DnsList: []string{"114.114.114.114", "114.114.115.115"}, + SubnetId: "3d543273-31c3-41f8-b887-ed8c2c837578", }, { Status: "ACTIVE", @@ -91,6 +94,7 @@ func TestListSubnet(t *testing.T) { PRIMARY_DNS: "114.114.114.114", SECONDARY_DNS: "114.114.115.115", DnsList: []string{"114.114.114.114", "114.114.115.115"}, + SubnetId: "3d543273-31c3-41f8-b887-ed8c2c837578", }, } th.AssertDeepEquals(t, expected, actual) @@ -123,7 +127,8 @@ func TestGetSubnet(t *testing.T) { "gateway_ip": "10.0.0.1", "dhcp_enable": true, "primary_dns": "100.125.4.25", - "secondary_dns": "8.8.8.8" + "secondary_dns": "8.8.8.8", + "neutron_subnet_id": "3d543273-31c3-41f8-b887-ed8c2c837578" } } `) @@ -136,6 +141,7 @@ func TestGetSubnet(t *testing.T) { th.AssertEquals(t, "10.0.0.0/24", n.CIDR) th.AssertEquals(t, "ACTIVE", n.Status) th.AssertEquals(t, "d4f2c817-d5df-4a66-994a-6571312b470e", n.VPC_ID) + th.AssertEquals(t, "3d543273-31c3-41f8-b887-ed8c2c837578", n.SubnetId) th.AssertEquals(t, "10.0.0.1", n.GatewayIP) th.AssertEquals(t, "100.125.4.25", n.PRIMARY_DNS) th.AssertEquals(t, "8.8.8.8", n.SECONDARY_DNS) @@ -193,7 +199,8 @@ func TestCreateSubnet(t *testing.T) { "dhcp_enable": true, "primary_dns": "8.8.8.8", "secondary_dns": "8.8.4.4", - "availability_zone": "eu-de-02" + "availability_zone": "eu-de-02", + "neutron_subnet_id": "3d543273-31c3-41f8-b887-ed8c2c837578" } } `) }) @@ -221,6 +228,7 @@ func TestCreateSubnet(t *testing.T) { th.AssertEquals(t, "6b0cf733-f496-4159-9df1-d74c3584a9f7", n.ID) th.AssertEquals(t, "UNKNOWN", n.Status) th.AssertEquals(t, "3b9740a0-b44d-48f0-84ee-42eb166e54f7", n.VPC_ID) + th.AssertEquals(t, "3d543273-31c3-41f8-b887-ed8c2c837578", n.SubnetId) th.AssertEquals(t, "8.8.8.8", n.DnsList[0]) th.AssertEquals(t, "8.8.4.4", n.DnsList[1])