From 34c3d065b842d5a047e439c808579835076d5eff Mon Sep 17 00:00:00 2001
From: tinova <tinova@3034c82b-c49b-4eb3-8279-a7acafdc01c0>
Date: Tue, 7 Jul 2009 17:54:05 +0000
Subject: [PATCH] Adapting VMWare drivers to new XML schema.

Fixing VMWare minor driver bugs. Adding unregistering feature.

git-svn-id: http://svn.opennebula.org/one/trunk@662 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/im_mad/vmware/OneImVmware.java       | 17 ++++++-----------
 src/vmm_mad/vmware/DeployVM.java         | 10 ++++++----
 src/vmm_mad/vmware/OperationsOverVM.java |  6 ++++--
 src/vmm_mad/vmware/install-vmware.sh     |  6 ++++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/im_mad/vmware/OneImVmware.java b/src/im_mad/vmware/OneImVmware.java
index bc86a02..b63d840 100644
--- a/src/im_mad/vmware/OneImVmware.java
+++ b/src/im_mad/vmware/OneImVmware.java
@@ -107,15 +107,7 @@ else if (action.equals("FINALIZE"))
                        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 @@ else if (action.equals("MONITOR"))
                               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 @@ else if (action.equals("MONITOR"))
                               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)
diff --git a/src/vmm_mad/vmware/DeployVM.java b/src/vmm_mad/vmware/DeployVM.java
index 380c3cb..afcbb92 100644
--- a/src/vmm_mad/vmware/DeployVM.java
+++ b/src/vmm_mad/vmware/DeployVM.java
@@ -403,8 +403,8 @@ private String getDataStoreName(int size) throws Exception{
         }
         
         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 @@ private String getDataStoreName(int size) throws Exception{
         }
         
         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 @@ private String getDataStoreName(int size) throws Exception{
     }
     
 
-}
\ No newline at end of file
+}
diff --git a/src/vmm_mad/vmware/OperationsOverVM.java b/src/vmm_mad/vmware/OperationsOverVM.java
index fdd3fa2..1165e6d 100644
--- a/src/vmm_mad/vmware/OperationsOverVM.java
+++ b/src/vmm_mad/vmware/OperationsOverVM.java
@@ -264,8 +264,10 @@ private ManagedObjectReference traverseSnapshotInTree(
          }
 
          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 @@ private ManagedObjectReference traverseSnapshotInTree(
         datacenterName = "ha-datacenter";                                    
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/vmm_mad/vmware/install-vmware.sh b/src/vmm_mad/vmware/install-vmware.sh
index 1ff5030..29cb637 100755
--- a/src/vmm_mad/vmware/install-vmware.sh
+++ b/src/vmm_mad/vmware/install-vmware.sh
@@ -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