From 585391d14ce4b355d4134559cc8fa9412ddde083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Fri, 24 Apr 2009 17:20:26 +0000 Subject: [PATCH] Initial commit for VMWare drivers: the Information Manager. git-svn-id: http://svn.opennebula.org/one/trunk@490 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/im_mad/vmware/OneImVmware.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/im_mad/vmware/OneImVmware.java b/src/im_mad/vmware/OneImVmware.java index bc86a02567..516518c9af 100644 --- a/src/im_mad/vmware/OneImVmware.java +++ b/src/im_mad/vmware/OneImVmware.java @@ -132,8 +132,15 @@ class OneImVmware extends Thread argsWithHost[i] = arguments[i]; } +<<<<<<< HEAD:trunk/src/im_mad/vmware/OneImVmware.java argsWithHost[arguments.length] = "--url"; argsWithHost[arguments.length + 1 ] = "https://" + hostToMonitor + ":443/sdk"; +======= + //argsWithHost[arguments.length] = "--url https://" + hostToMonitor + ":443/sdk"; + //TODO for testing only + argsWithHost[arguments.length] = "--url"; + argsWithHost[arguments.length + 1 ] = "https://" + "localhost" + ":8008/sdk"; +>>>>>>> Initial commit for VMWare drivers: the Information Manager.:trunk/src/im_mad/vmware/OneImVmware.java gP = new GetProperty(argsWithHost, "HostSystem", hostToMonitor); // Now it's time to build the response gathering the properties needed