more xml fixes

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 15 insertions, 9 deletions

diff --git a/addDroplet.go b/addDroplet.go
index ba2701c..df60113 100644
--- a/addDroplet.go
+++ b/addDroplet.go
@@ -159,7 +159,7 @@ func updateDroplet(d *DropletT, domcfg *libvirtxml.Domain) error {
 
 	e, err = updateNetwork(d, domcfg)
 	if err != nil {
-		log.Info("updateNetwork() failed")
+		log.Info("updateNetwork() failed", err)
 		return errors.New("updateNetwork() failed")
 	}
 	if e != nil {
@@ -240,16 +240,22 @@ func updateNetwork(d *DropletT, domcfg *libvirtxml.Domain) (*pb.Event, error) {
 			// log.Info("Interface:", iface.Target, "MAC Address:", iface.MAC.Address)
 			// fmt.Printf("source: %+v\n", iface.Source)
 			hwaddr = iface.MAC.Address
-		} else {
-			fmt.Printf("iface: %+v\n", iface)
-			fmt.Printf("Interface Target: %+v, MAC Address not available\n", iface.Target)
-			return nil, errors.New("network XML does not have a MAC Address")
 		}
-		if iface.Source != nil {
-			if iface.Source.Bridge != nil {
-				brname = iface.Source.Bridge.Bridge
+			if iface.Source == nil {
+				fmt.Printf("non-standard network: %+v\n", iface)
+				return nil, errors.New("non-standard network")
 			}
-		}
+
+			if iface.Source.Bridge == nil {
+				fmt.Printf("non-standard network: %+v\n", iface)
+				return nil, errors.New("bridge is blank nil and no mac address")
+			}
+			if iface.Source.Bridge.Bridge == "" {
+				return nil, errors.New("bridge is blank and no mac address")
+			}
+			// log.Info("network has bridge:", iface.Source.Bridge.Bridge)
+			brname = iface.Source.Bridge.Bridge
+			hwaddr = "generate"
 		macs[hwaddr] = brname
 	}