Merge pull request #17541 from aboch/uc

Modify IPAMConfig structure json tags Upstream-commit: 8d7d51190d43ca61b5af855374044f51d6a9fa9d Component: engine
2015-10-30 14:01:13 -07:00
parent fd1dd585d7 4bf986fcb9
commit 4f1bd73407
1 changed files with 6 additions and 6 deletions
@@ -10,16 +10,16 @@ type Address struct {

 // IPAM represents IP Address Management
 type IPAM struct {
-	Driver string       `json:"driver"`
-	Config []IPAMConfig `json:"config"`
+	Driver string
+	Config []IPAMConfig
 }

 // IPAMConfig represents IPAM configurations
 type IPAMConfig struct {
-	Subnet     string            `json:"subnet,omitempty"`
-	IPRange    string            `json:"ip_range,omitempty"`
-	Gateway    string            `json:"gateway,omitempty"`
-	AuxAddress map[string]string `json:"auxiliary_address,omitempty"`
+	Subnet     string            `json:",omitempty"`
+	IPRange    string            `json:",omitempty"`
+	Gateway    string            `json:",omitempty"`
+	AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
 }

 // Settings stores configuration details about the daemon network config