瀏覽代碼

Merge pull request #17541 from aboch/uc

Modify IPAMConfig structure json tags
Alexandre Beslic 9 年之前
父節點
當前提交
8d7d51190d
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      daemon/network/settings.go

+ 6 - 6
daemon/network/settings.go

@@ -10,16 +10,16 @@ type Address struct {
 
 
 // IPAM represents IP Address Management
 // IPAM represents IP Address Management
 type IPAM struct {
 type IPAM struct {
-	Driver string       `json:"driver"`
-	Config []IPAMConfig `json:"config"`
+	Driver string
+	Config []IPAMConfig
 }
 }
 
 
 // IPAMConfig represents IPAM configurations
 // IPAMConfig represents IPAM configurations
 type IPAMConfig struct {
 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
 // Settings stores configuration details about the daemon network config