shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Adapting VMWare drivers to new XML schema.

Browse Source 
Fixing VMWare minor driver bugs. Adding unregistering feature.

git-svn-id: http://svn.opennebula.org/one/trunk@662 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Constantino Vázquez Blanco 2009-07-07 17:54:05 +00:00
parent df96a564cd
commit 2f73f9f4d5
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/im_mad/vmware/OneImVmware.java
View File

@ -107,15 +107,7 @@ class OneImVmware extends Thread
hid_str = str_split[1];
hostToMonitor = str_split[2];
// Perform the action
if (action.equals("INIT"))
init();
else if (action.equals("FINALIZE"))
{
finalize_mad();
fin = true;
}
else if (action.equals("MONITOR"))
if (action.equals("MONITOR"))
{
// Let's gather data from the host
@ -130,10 +122,13 @@ class OneImVmware extends Thread
for(int i=0;i<arguments.length;i++)
{
argsWithHost[i] = arguments[i];
System.out.println(arguments[i]);
}
argsWithHost[arguments.length] = "--url";
argsWithHost[arguments.length + 1 ] = "https://" + hostToMonitor + ":443/sdk";
//argsWithHost[arguments.length + 1 ] = "https://" + hostToMonitor + ":443/sdk";
argsWithHost[arguments.length + 1 ] = "https://localhost:8008/sdk";
gP = new GetProperty(argsWithHost, "HostSystem", hostToMonitor);
// Now it's time to build the response gathering the properties needed
@ -201,7 +196,7 @@ class OneImVmware extends Thread
e.printStackTrace();
System.err.println("MONITOR FAILURE " + hid_str + " Failed monitoring host " +
hostToMonitor + ". Please check the VM log.");
hostToMonitor + ".");
} // catch
} // if (action.equals("MONITOR"))
} // else if (str_split.length != 4)

10
src/vmm_mad/vmware/DeployVM.java
View File

@ -403,8 +403,8 @@ public class DeployVM
}
argsWithHost[args.length] = "--url";
argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
//argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
cb = AppUtil.initialize("DeployVM", null, argsWithHost);
@ -438,7 +438,9 @@ public class DeployVM
}
argsWithHost[args.length] = "--url";
argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
// argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
cb = AppUtil.initialize("DeployVM", null, argsWithHost);
@ -461,4 +463,4 @@ public class DeployVM
}
}
}

6
src/vmm_mad/vmware/OperationsOverVM.java
View File

@ -264,8 +264,10 @@ public class OperationsOverVM
}
argsWithHost[args.length] = "--url";
argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
//argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
cb = AppUtil.initialize("DeployVM", null, argsWithHost);
cb.connect();
@ -275,4 +277,4 @@ public class OperationsOverVM
datacenterName = "ha-datacenter";
}
}
}

6
src/vmm_mad/vmware/install-vmware.sh
View File

@ -9,12 +9,14 @@ echo -n "Installing VMWare drivers."
javac OneVmmVmware.java
cp *class $ONE_LOCATION/lib/mads
cp one_vmm_vmware $ONE_LOCATION/bin
cp one_vmm_vmware $ONE_LOCATION/lib/mads
chmod +x $ONE_LOCATION/lib/mads/one_vmm_vmware
cd ../../im_mad/vmware/
javac OneImVmware.java
cp *class $ONE_LOCATION/lib/mads
cp one_im_vmware $ONE_LOCATION/bin
cp one_im_vmware $ONE_LOCATION/lib/mads
chmod +x $ONE_LOCATION/lib/mads/one_im_vmware
cd -
cd ../../tm_mad/vmware