fixes for both add_interface commands

2 files changed, 7 insertions, 20 deletions

diff --git a/kernel/networking/add_interface/runtest.sh b/kernel/networking/add_interface/runtest.sh
index edd236d..1060058 100755
--- a/kernel/networking/add_interface/runtest.sh
+++ b/kernel/networking/add_interface/runtest.sh
@@ -29,24 +29,11 @@
 # Include Beaker environment
 . /usr/bin/rhts-environment.sh || exit 1
 
-add_interface()
-{
-    local intf=$1
-    local ipaddr=$2
-    local ip=$(echo $ipaddr | sed -e 's/\/.*//')
-    local netmask=$(ipcalc -m $ipaddr)
-    cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$intf
-DEVICE=$intf
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=$ip
-$netmask
-EOF
-}
-
 for intf in $INTERFACES; do
-    ipaddr=$(eval echo \$$intf)
-    add_interface $intf $ipaddr && report_result $TEST/$intf PASS 0 || report_result $TEST/$intf FAIL 1
+    > /etc/sysconfig/network-scripts/ifcfg-$intf
+    for entry in $(eval echo \$$intf); do
+        echo $entry >> /etc/sysconfig/network-scripts/ifcfg-$intf
+    done
+    cat /etc/sysconfig/network-scripts/ifcfg-$intf
 done
 service network restart && report_result $TEST/restart_network PASS 0 || report_result $TEST/restart_network FAIL 1
diff --git a/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh b/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh
index 1922c54..7cd1efe 100755
--- a/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh
+++ b/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh
@@ -45,9 +45,9 @@ add_interface()
     local guest=$1
     local switch=$2
     local slot=$(find_free_slot $guest)
-    sed -ie "0,/<\/interface>/ {/<\/interface>/ a\
+    sed -ie "/<\/devices>/ i\
 <interface type='bridge'>\n\<source bridge='$switch'\/>\n\<virtualport type='openvswitch'\/>\n\<model type='virtio'\/>\n\<address type='pci' domain='0x0000' bus='0x00' slot='$slot' function='0x0'\/>\n\<\/interface>
-}" $guest
+" $guest
    return $?
 }