From 50bb7f3ed410c9397cd62f1befed8e3c2f23a77e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Thu, 10 Nov 2011 18:51:08 +0100
Subject: [PATCH] Feature #863: Add new vn_mad to java oca

---
 src/oca/java/src/org/opennebula/client/host/Host.java | 6 +++++-
 src/oca/java/test/HostTest.java                       | 6 ++++--
 src/oca/java/test/VirtualMachineTest.java             | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/oca/java/src/org/opennebula/client/host/Host.java b/src/oca/java/src/org/opennebula/client/host/Host.java
index 20a82df64b..0cc9d646d7 100644
--- a/src/oca/java/src/org/opennebula/client/host/Host.java
+++ b/src/oca/java/src/org/opennebula/client/host/Host.java
@@ -72,6 +72,9 @@ public class Host extends PoolElement{
      * @param vmm The name of the virtual machine manager mad name
      * (vmm_mad_name), this values are taken from the oned.conf with the
      * tag name VM_MAD (name)
+     * @param vnm The name of the virtual network manager mad name
+     * (vnm_mad_name), this values are taken from the oned.conf with the
+     * tag name VN_MAD (name)
      * @param tm The transfer manager mad name to be used with this host 
      * @return If successful the message contains the associated
      * id generated for this host
@@ -80,9 +83,10 @@ public class Host extends PoolElement{
                                        String hostname,
                                        String im,
                                        String vmm,
+                                       String vnm,
                                        String tm)
     {
-        return client.call(ALLOCATE, hostname, im, vmm, tm);
+        return client.call(ALLOCATE, hostname, im, vmm, vnm, tm);
     }
 
     /**
diff --git a/src/oca/java/test/HostTest.java b/src/oca/java/test/HostTest.java
index 81f1878b6a..dfb58022fc 100644
--- a/src/oca/java/test/HostTest.java
+++ b/src/oca/java/test/HostTest.java
@@ -63,7 +63,8 @@ public class HostTest
     @Before
     public void setUp() throws Exception
     {
-        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "tm_dummy");
+        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vnm_dummy",
+            "tm_dummy");
 
         int hid = !res.isError() ? Integer.parseInt(res.getMessage()) : -1;
         host    = new Host(hid, client);
@@ -83,7 +84,8 @@ public class HostTest
     {
         String name = "allocate_test";
 
-        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "tm_dummy");
+        res = Host.allocate(client, name, "im_dummy", "vmm_dummy", "vmm_dummy",
+            "tm_dummy");
         assertTrue( !res.isError() );
 //        assertTrue( res.getMessage().equals("0") );
 
diff --git a/src/oca/java/test/VirtualMachineTest.java b/src/oca/java/test/VirtualMachineTest.java
index 115042df16..1f2bacd492 100644
--- a/src/oca/java/test/VirtualMachineTest.java
+++ b/src/oca/java/test/VirtualMachineTest.java
@@ -80,11 +80,11 @@ public class VirtualMachineTest
 
 
         res = Host.allocate(client, "host_A",
-                            "im_dummy", "vmm_dummy", "tm_dummy");
+                            "im_dummy", "vmm_dummy", "vmm_dummy", "tm_dummy");
         hid_A = Integer.parseInt( res.getMessage() );
 
         res = Host.allocate(client, "host_B",
-                            "im_dummy", "vmm_dummy", "tm_dummy");
+                            "im_dummy", "vmm_dummy", "vmm_dummy", "tm_dummy");
         hid_B = Integer.parseInt( res.getMessage() );
     }