Merge pull request #490 from kyounghunJang/Add-DefaultNetwork

Add a DefaultNetwork field to NetworkInfo

Author: Luap99

common/libnetwork/cni/network.go

@@ -327,9 +327,10 @@ func (n *cniNetwork) NetworkInfo() types.NetworkInfo {
 	}
 
 	info := types.NetworkInfo{
-		Backend: types.CNI,
-		Package: packageVersion,
-		Path:    path,
+		Backend:        types.CNI,
+		Package:        packageVersion,
+		Path:           path,
+		DefaultNetwork: n.defaultNetwork,
 	}
 
 	dnsPath := filepath.Join(path, "dnsname")

common/libnetwork/netavark/network.go

@@ -369,10 +369,11 @@ func (n *netavarkNetwork) NetworkInfo() types.NetworkInfo {
 		logrus.Infof("Failed to get the netavark version: %v", err)
 	}
 	info := types.NetworkInfo{
-		Backend: types.Netavark,
-		Version: programVersion,
-		Package: packageVersion,
-		Path:    path,
+		Backend:        types.Netavark,
+		Version:        programVersion,
+		Package:        packageVersion,
+		Path:           path,
+		DefaultNetwork: n.defaultNetwork,
 	}
 
 	dnsPath := n.aardvarkBinary

common/libnetwork/types/network.go

@@ -97,11 +97,12 @@ type NetworkUpdateOptions struct {
 
 // NetworkInfo contains the network information.
 type NetworkInfo struct {
-	Backend NetworkBackend `json:"backend"`
-	Version string         `json:"version,omitempty"`
-	Package string         `json:"package,omitempty"`
-	Path    string         `json:"path,omitempty"`
-	DNS     DNSNetworkInfo `json:"dns,omitempty"`
+	Backend        NetworkBackend `json:"backend"`
+	Version        string         `json:"version,omitempty"`
+	Package        string         `json:"package,omitempty"`
+	Path           string         `json:"path,omitempty"`
+	DNS            DNSNetworkInfo `json:"dns,omitempty"`
+	DefaultNetwork string         `json:"default_network,omitempty"`
 }
 
 // DNSNetworkInfo contains the DNS information.