From bdf81fac4346f25eb11ce4834afc5d918a6f92d1 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 20 Apr 2010 20:44:28 +0200
Subject: now different port forwards can be submitted via xml, to be tested

---
 .../plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm       |  4 ++--
 os-plugins/plugins/vmgrid/files/run-vmgrid.sh       | 21 +++++++++++++++++++--
 .../init-hooks/80-after-plugins/virtualization.sh   |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'os-plugins/plugins/vmgrid')

diff --git a/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm b/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
index 401a2151..c3542274 100644
--- a/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
+++ b/os-plugins/plugins/vmgrid/OpenSLX/OSPlugin/vmgrid.pm
@@ -72,9 +72,9 @@ sub getAttrInfo
             description => unshiftHereDoc(<<'            End-of-Here'),
                 which virtualization technique schould be used?
             End-of-Here
-            content_regex => qr{^(vmware|virtualbox|qemukvm|xen)$},
+            content_regex => qr{^(virtualbox|qemukvm|xen)$},
             #openvz|vserver
-            content_descr => 'vmware, virtualbox, qemukvm, xen',
+            content_descr => 'virtualbox, qemukvm, xen',
             #openvz, vserver
             default => undef,
         },
diff --git a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
index a684310b..4fdd4af0 100644
--- a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
+++ b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
@@ -289,11 +289,28 @@ vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' \
            | tr [A-Z] [a-z])
 
 # definition of the networking the client system is connected to
-network_kind=$(grep -io 'network param=.*"' ${xmlfile} \
+network_kind=$(grep -io '<network param=.*"' ${xmlfile} \
                | awk -F '"' '{ print $2 }' | tr [A-Z] [a-z])
-network_card=$(grep -io 'netcard param=.*"' ${xmlfile} \
+network_card=$(grep -io '<netcard param=.*"' ${xmlfile} \
                | awk -F '"' '{ print $2 }'| tr [A-Z] [a-z])
 
+# define redirects
+redirects=$(grep -ic '<redirect name=.*"' ${xmlfile})
+[ -z "${redirects}" ] && redirects=0
+(( i=1 ))
+while [ ${i} -le ${redirects} ]; do
+  # get only the $i-th line
+  redirect_name[$i]=$(grep -m ${i} -io '<redirect.*' ${xmlfile} | tail -n 1 \
+                      | grep -o "name=\".*" | awk -F '"' '{ print $2 }')
+  redirect_proto[$i]=$(grep -m ${i} -io '<redirect.*' ${xmlfile} | tail -n 1 \
+                       | grep -o "proto=\".*" | awk -F '"' '{ print $2 }')
+  redirect_hport[$i]=$(grep -m ${i} -io '<redirect.*' ${xmlfile} | tail -n 1 \
+                       | grep -o "hostport=\".*" | awk -F '"' '{ print $2 }')
+  redirect_gport[$i]=$(grep -m ${i} -io '<redirect.*' ${xmlfile} | tail -n 1 \
+                       | grep -o "guestport=\".*" | awk -F '"' '{ print $2 }')
+  (( i=$i+1 ))
+done
+
 writelog "\tVirtualization:\t\t$xmlvirt"
 writelog "\tVM name:\t\t$vm_name"
 writelog "\tVM short name:\t\t$vm_shortname"
diff --git a/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh b/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh
index 400075cd..a1da2e63 100644
--- a/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh
+++ b/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh
@@ -30,7 +30,7 @@ active=0
 [ ${vmgrid_active} -ne 0 ] && active=1
 
 [ $DEBUGLEVEL -gt 0 ] \
-  && echo -e "Executing the virtual 'virtualization' plugin ... \c"
+  && echo -e "Executing the 'virtualization' plugin ... \c"
 
 if [ ${active} -ne 0 ] ; then
 
-- 
cgit v1.2.3-55-g7522