Moved xmldocument structure to common directory

Author: tamilmani1989

cni/network/plugin/main.go

@@ -14,8 +14,7 @@ import (
 )
 
 const (
-	//hostNetAgentURL = "http://169.254.169.254/machine/plugins?comp=netagent&type=cnireport"
-	hostNetAgentURL = "http://localhost:3500/"
+	hostNetAgentURL = "http://169.254.169.254/machine/plugins?comp=netagent&type=cnireport"
 	ipamQueryURL    = "http://169.254.169.254/machine/plugins?comp=nmagent&type=getinterfaceinfov1"
 	pluginName      = "CNI"
 	reportType      = "application/json"

common/utils.go

@@ -4,11 +4,33 @@
 package common
 
 import (
+	"encoding/xml"
 	"net"
 
 	"github.com/Azure/azure-container-networking/log"
 )
 
+// Azure host agent XML document format.
+type XmlDocument struct {
+	XMLName   xml.Name `xml:"Interfaces"`
+	Interface []struct {
+		XMLName    xml.Name `xml:"Interface"`
+		MacAddress string   `xml:"MacAddress,attr"`
+		IsPrimary  bool     `xml:"IsPrimary,attr"`
+
+		IPSubnet []struct {
+			XMLName xml.Name `xml:"IPSubnet"`
+			Prefix  string   `xml:"Prefix,attr"`
+
+			IPAddress []struct {
+				XMLName   xml.Name `xml:"IPAddress"`
+				Address   string   `xml:"Address,attr"`
+				IsPrimary bool     `xml:"IsPrimary,attr"`
+			}
+		}
+	}
+}
+
 // LogNetworkInterfaces logs the host's network interfaces in the default namespace.
 func LogNetworkInterfaces() {
 	interfaces, err := net.Interfaces()

ipam/azure.go

@@ -31,27 +31,6 @@ type azureSource struct {
 	lastRefresh   time.Time
 }
 
-// Azure host agent XML document format.
-type xmlDocument struct {
-	XMLName   xml.Name `xml:"Interfaces"`
-	Interface []struct {
-		XMLName    xml.Name `xml:"Interface"`
-		MacAddress string   `xml:"MacAddress,attr"`
-		IsPrimary  bool     `xml:"IsPrimary,attr"`
-
-		IPSubnet []struct {
-			XMLName xml.Name `xml:"IPSubnet"`
-			Prefix  string   `xml:"Prefix,attr"`
-
-			IPAddress []struct {
-				XMLName   xml.Name `xml:"IPAddress"`
-				Address   string   `xml:"Address,attr"`
-				IsPrimary bool     `xml:"IsPrimary,attr"`
-			}
-		}
-	}
-}
-
 // Creates the Azure source.
 func newAzureSource(options map[string]interface{}) (*azureSource, error) {
 	queryUrl, _ := options[common.OptIpamQueryUrl].(string)
@@ -114,7 +93,7 @@ func (s *azureSource) refresh() error {
 	defer resp.Body.Close()
 
 	// Decode XML document.
-	var doc xmlDocument
+	var doc common.XmlDocument
 	decoder := xml.NewDecoder(resp.Body)
 	err = decoder.Decode(&doc)
 	if err != nil {

telemetry/telemetry.go

@@ -6,33 +6,12 @@ package telemetry
 import (
 	"bytes"
 	"encoding/json"
-	"encoding/xml"
 	"fmt"
 	"log"
 	"net/http"
 	"os"
 )
 
-type xmlDocument struct {
-	XMLName   xml.Name `xml:"Interfaces"`
-	Interface []struct {
-		XMLName    xml.Name `xml:"Interface"`
-		MacAddress string   `xml:"MacAddress,attr"`
-		IsPrimary  bool     `xml:"IsPrimary,attr"`
-
-		IPSubnet []struct {
-			XMLName xml.Name `xml:"IPSubnet"`
-			Prefix  string   `xml:"Prefix,attr"`
-
-			IPAddress []struct {
-				XMLName   xml.Name `xml:"IPAddress"`
-				Address   string   `xml:"Address,attr"`
-				IsPrimary bool     `xml:"IsPrimary,attr"`
-			}
-		}
-	}
-}
-
 // OS Details structure.
 type OSInfo struct {
 	OSType         string
@@ -68,6 +47,7 @@ type BridgeInfo struct {
 	BridgeName  string
 }
 
+// Orchestrator Details structure.
 type OrchsestratorInfo struct {
 	OrchestratorName    string
 	OrchestratorVersion string

telemetry/telemetry_linux.go

@@ -15,6 +15,8 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+
+	"github.com/Azure/azure-container-networking/common"
 )
 
 // Memory Info structure.
@@ -207,7 +209,7 @@ func GetInterfaceDetails(queryUrl string) (*InterfaceInfo, error) {
 	defer resp.Body.Close()
 
 	// Decode XML document.
-	var doc xmlDocument
+	var doc common.XmlDocument
 	decoder := xml.NewDecoder(resp.Body)
 	err = decoder.Decode(&doc)
 	if err != nil {

telemetry/telemetry_windows.go

@@ -13,6 +13,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/Azure/azure-container-networking/common"
 )
 
 type MemInfo struct {
@@ -107,7 +109,7 @@ func GetInterfaceDetails(queryUrl string) (*InterfaceInfo, error) {
 	defer resp.Body.Close()
 
 	// Decode XML document.
-	var doc xmlDocument
+	var doc common.XmlDocument
 	decoder := xml.NewDecoder(resp.Body)
 	err = decoder.Decode(&doc)
 	if err != nil {