ip addr range fixes (#29)

contiv · Jun 30, 2016 · 508ec31 · 508ec31
1 parent de250b0
commit 508ec31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/client/contivModelClient.go b/client/contivModelClient.go
@@ -318,6 +318,7 @@ type NetworkLinks struct {
 type NetworkOper struct {
 	AllocatedAddressesCount int            `json:"allocatedAddressesCount,omitempty"` // Vlan/Vxlan Tag
 	AllocatedIPAddresses    string         `json:"allocatedIPAddresses,omitempty"`    // allocated IP addresses
+	AvailableIPAddresses    string         `json:"availableIPAddresses,omitempty"`    // Available IP addresses
 	DnsServerIP             string         `json:"dnsServerIP,omitempty"`             // dns IP for the network
 	Endpoints               []EndpointOper `json:"endpoints,omitempty"`
 	ExternalPktTag          int            `json:"externalPktTag,omitempty"` // external packet tag

diff --git a/contivModel.go b/contivModel.go
@@ -192,6 +192,7 @@ type NetworkLinks struct {
 type NetworkOper struct {
 	AllocatedAddressesCount int            `json:"allocatedAddressesCount,omitempty"` // Vlan/Vxlan Tag
 	AllocatedIPAddresses    string         `json:"allocatedIPAddresses,omitempty"`    // allocated IP addresses
+	AvailableIPAddresses    string         `json:"availableIPAddresses,omitempty"`    // Available IP addresses
 	DnsServerIP             string         `json:"dnsServerIP,omitempty"`             // dns IP for the network
 	Endpoints               []EndpointOper `json:"endpoints,omitempty"`
 	ExternalPktTag          int            `json:"externalPktTag,omitempty"` // external packet tag
@@ -2562,7 +2563,7 @@ func ValidateNetwork(obj *Network) error {
 		return errors.New("pktTag Value Out of bound")
 	}
 
-	subnetMatch := regexp.MustCompile("^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\-(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$")
+	subnetMatch := regexp.MustCompile("^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\-((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$")
 	if subnetMatch.MatchString(obj.Subnet) == false {
 		return errors.New("subnet string invalid format")
 	}

diff --git a/network.json b/network.json
@@ -41,7 +41,7 @@
 				},
 				"subnet": {
 					"type": "string",
-					"format": "^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\\\-(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$",
+					"format": "^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\\\-((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))?/(3[0-1]|2[0-9]|1[0-9]|[1-9])$",
 					"title": "Subnet",
 					"showSummary": true
 				},
@@ -85,6 +85,10 @@
 					"type": "string",
 					"title": "allocated IP addresses"
 				},
+				"availableIPAddresses": {
+					"type": "string",
+					"title": "Available IP addresses"
+				},
 				"dnsServerIP": {
 					"type": "string",
 					"title": "dns IP for the network"