fix(network-instance): network_instance ip schema (#64)

* fix(network-instance): schema / gateway not computed

* test ip

* fix ip test

Author: fabian-zededa

resources/network_instance_test.go

@@ -138,7 +138,6 @@ func testNetworkInstanceAttributes(t *testing.T, got, expected *models.NetworkIn
 		ignoredFields := []string{
 			"ID",
 			"Revision",
-			"IP",
 			"DNSList",
 			"DeviceID",
 			"ProjectID",

resources/testdata/network_instance/create_complete.tf

@@ -43,22 +43,22 @@ resource "zedcloud_network_instance" "complete" {
         ]
         hostname = "wwww.ns1.example.com"
     }
-    # computed or changed by api?
-    # ip {
-    #     # not supported by API
-    #     # domain = "htttp://example.com"
-    #     # gateway = "10.1.0.1"
+    ip {
+        domain = "htttp://example.com"
 
-    #     dhcp_range {
-    #         end = "10.2.255.254"
-    #         start = "10.2.0.128"
-    #     }
-    #     dns = [
-    #         "10.2.0.1"
-    #     ]
-    #     mask = "255.255.255.0"
-    #     ntp = "10.1.0.2"
-    # }
+        gateway = "10.0.20.1"
+        subnet = "10.0.20.0/24"
+
+        dhcp_range {
+            end = "10.0.20.100"
+            start = "10.0.20.50"
+        }
+        # dns = [
+        #     "10.0.20.1"
+        # ]
+        mask = "255.255.255.0"
+        ntp = "10.1.0.2"
+    }
     opaque {
         oconfig = "Test OConfig"
         type = "OPAQUE_CONFIG_TYPE_UNSPECIFIED"

resources/testdata/network_instance/create_complete_expected.yaml

@@ -11,17 +11,16 @@ dnslist:
         - 10.1.2.1
         - 10.1.2.2
       hostname: wwww.ns2.example.com
-# ip:
-#     dhcprange:
-#         end: 10.2.255.254
-#         start: 10.2.0.128
-#     dns:
-#         - 10.2.0.1
-#     domain: ""
-#     gateway: 10.2.0.1
-#     mask: 255.255.255.0
-#     ntp: 10.1.0.2
-#     subnet: 10.2.0.0/16
+ip:
+    domain: "htttp://example.com"
+    gateway: "10.0.20.1"
+    subnet: "10.0.20.0/24"
+    dhcprange:
+        end: "10.0.20.100"
+        start: "10.0.20.50"
+    dns: []
+    mask: "255.255.255.0"
+    ntp: "10.1.0.2"
 kind: NETWORK_INSTANCE_KIND_LOCAL
 lisp: null
 name: complete

schemas/dhcp_server.go

@@ -56,11 +56,11 @@ func DHCPServerModelFromMap(m map[string]interface{}) *models.DhcpServerConfig {
 			dnsSlice = append(dnsSlice, i.(string))
 		}
 	}
-	domain := m["domain"].(string)
-	gateway := m["gateway"].(string)
-	mask := m["mask"].(string)
-	ntp := m["ntp"].(string)
-	subnet := m["subnet"].(string)
+	domain, _ := m["domain"].(string)
+	gateway, _ := m["gateway"].(string)
+	mask, _ := m["mask"].(string)
+	ntp, _ := m["ntp"].(string)
+	subnet, _ := m["subnet"].(string)
 	return &models.DhcpServerConfig{
 		DhcpRange: dhcpRange,
 		DNS:       dns,
@@ -109,7 +109,6 @@ func DHCPServer() map[string]*schema.Schema {
 				Schema: DhcpIPRange(),
 			},
 			Optional: true,
-			Computed: true,
 		},
 
 		"dns": {
@@ -131,7 +130,7 @@ func DHCPServer() map[string]*schema.Schema {
 		"gateway": {
 			Description: `IP Address of Network Gateway`,
 			Type:        schema.TypeString,
-			Computed:    true,
+			Optional:    true,
 		},
 
 		"mask": {