Add a network-scoped mac_address field

akerouanton · akerouanton · commit 0282c0c0958a · 2023-11-20T16:27:57.000+01:00
Related to: - compose-spec/compose-spec#435 Signed-off-by: Albin Kerouanton <albinker@gmail.com>
diff --git a/loader/full-example.yml b/loader/full-example.yml
@@ -235,6 +235,7 @@ services:
       other-network:
         ipv4_address: 172.16.238.10
         ipv6_address: 2001:3984:3989::10
+        mac_address: 02:42:72:98:65:08
       other-other-network:
 
     pid: "host"
diff --git a/loader/full-struct_test.go b/loader/full-struct_test.go
@@ -233,6 +233,7 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 				"other-network": {
 					Ipv4Address: "172.16.238.10",
 					Ipv6Address: "2001:3984:3989::10",
+					MacAddress:  "02:42:72:98:65:08",
 				},
 				"other-other-network": nil,
 			},
@@ -775,6 +776,7 @@ services:
       other-network:
         ipv4_address: 172.16.238.10
         ipv6_address: 2001:3984:3989::10
+        mac_address: 02:42:72:98:65:08
       other-other-network: null
       some-network:
         aliases:
@@ -1392,7 +1394,8 @@ func fullExampleJSON(workingDir, homeDir string) string {
       "networks": {
         "other-network": {
           "ipv4_address": "172.16.238.10",
-          "ipv6_address": "2001:3984:3989::10"
+          "ipv6_address": "2001:3984:3989::10",
+          "mac_address": "02:42:72:98:65:08"
         },
         "other-other-network": null,
         "some-network": {
diff --git a/schema/compose-spec.json b/schema/compose-spec.json
@@ -294,6 +294,7 @@
                         "ipv4_address": {"type": "string"},
                         "ipv6_address": {"type": "string"},
                         "link_local_ips": {"$ref": "#/definitions/list_of_strings"},
+                        "mac_address": {"type": "string"},
                         "priority": {"type": "number"}
                       },
                       "additionalProperties": false,
diff --git a/types/types.go b/types/types.go
@@ -419,6 +419,7 @@ type ServiceNetworkConfig struct {
 	Ipv4Address  string   `yaml:"ipv4_address,omitempty" json:"ipv4_address,omitempty"`
 	Ipv6Address  string   `yaml:"ipv6_address,omitempty" json:"ipv6_address,omitempty"`
 	LinkLocalIPs []string `yaml:"link_local_ips,omitempty" json:"link_local_ips,omitempty"`
+	MacAddress   string   `yaml:"mac_address,omitempty" json:"mac_address,omitempty"`
 
 	Extensions Extensions `yaml:"#extensions,inline" json:"-"`
 }

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,7 @@ type ServiceNetworkConfig struct {`
`419`	`419`	Ipv4Address string `yaml:"ipv4_address,omitempty" json:"ipv4_address,omitempty"`
`420`	`420`	Ipv6Address string `yaml:"ipv6_address,omitempty" json:"ipv6_address,omitempty"`
`421`	`421`	LinkLocalIPs []string `yaml:"link_local_ips,omitempty" json:"link_local_ips,omitempty"`
	`422`	+ MacAddress string `yaml:"mac_address,omitempty" json:"mac_address,omitempty"`
`422`	`423`
`423`	`424`	Extensions Extensions `yaml:"#extensions,inline" json:"-"`
`424`	`425`	`}`