From c472c6c9f570add9a1032516ff321868f448551e Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Wed, 16 Nov 2011 16:36:35 +0100
Subject: [PATCH] Task #972: Add VNM driver to Sunstone.

Updated server, host info and host creation dialog.
(cherry picked from commit bccc091d8ed5bd9f44aa6cf6f0f8447ee63bf6e5)
---
 src/sunstone/models/OpenNebulaJSON/HostJSON.rb |  7 ++++---
 src/sunstone/public/js/plugins/hosts-tab.js    | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb
index d4395231bb..cf24bb1ee9 100644
--- a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb
@@ -27,9 +27,10 @@ module OpenNebulaJSON
             end
 
             self.allocate(host_hash['name'],
-                        host_hash['im_mad'],
-                        host_hash['vm_mad'],
-                        host_hash['tm_mad'])
+                          host_hash['im_mad'],
+                          host_hash['vm_mad'],
+                          host_hash['vnm_mad'],
+                          host_hash['tm_mad'])
         end
 
         def delete
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index c54d9a78d9..cfbf85d2f7 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -80,10 +80,19 @@ var create_host_tmpl =
                <option value="im_dummy">Dummy</option>\
       </select>\
     </div>\
+    <div class="manager clear" id="vnm_mads">\
+      <label>Virtual Network Manager:</label>\
+       <select id="vnm_mad" name="vn">\
+         <option value="dummy">Dummy</option>\
+         <option value="etables">Etables</option>\
+         <option value="ovswitch">Open vSwitch</option>\
+         <option value="802.1Q">802.1Q</option>\
+       </select>\
+    </div>\
     <div class="manager clear" id="tm_mads">\
       <label>Transfer Manager:</label>\
        <select id="tm_mad" name="tm">\
-         <option value="tm_shared">SHARED</option>\
+         <option value="tm_shared">Shared</option>\
          <option value="tm_ssh">SSH</option>\
          <option value="tm_dummy">Dummy</option>\
        </select>\
@@ -443,6 +452,10 @@ function updateHostInfo(request,host){
                 <td class="key_td">VM MAD</td>\
                 <td class="value_td">'+host_info.VM_MAD+'</td>\
             </tr>\
+            <tr>\
+                <td class="key_td">VN MAD</td>\
+                <td class="value_td">'+host_info.VN_MAD+'</td>\
+            </tr>\
             <tr>\
                 <td class="key_td">TM MAD</td>\
                 <td class="value_td">'+host_info.TM_MAD+'</td>\
@@ -537,6 +550,7 @@ function setupCreateHostDialog(){
                 "name": $('#name',this).val(),
                 "tm_mad": $('#tm_mad :selected',this).val(),
                 "vm_mad": $('#vmm_mad :selected',this).val(),
+                "vnm_mad": $('#vnm_mad :selected',this).val(),
                 "im_mad": $('#im_mad :selected',this).val()
             }
         }