[Kimchi-devel] [PATCH] [Kimchi 2/2] Use "macvtap" instead of "bridged"

[Lucio Correia]

Signed-off-by: Lucio Correia <luciojhc at linux.vnet.ibm.com>
---
 ui/js/src/kimchi.network.js          | 2 +-
 ui/js/src/kimchi.network_add_main.js | 4 ++--
 ui/pages/network-add.html.tmpl       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js
index c1c1ebd..cdc8b18 100644
--- a/ui/js/src/kimchi.network.js
+++ b/ui/js/src/kimchi.network.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-kimchi.NETWORK_TYPE_BRIDGE = "bridged";
+kimchi.NETWORK_TYPE_BRIDGE = "macvtap";
 
 kimchi.initNetwork = function() {
     if(wok.tabMode['network'] === 'admin') {
diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js
index c28c9ce..f6d048c 100644
--- a/ui/js/src/kimchi.network_add_main.js
+++ b/ui/js/src/kimchi.network_add_main.js
@@ -114,7 +114,7 @@ kimchi.enableBridgeOptions = function(enable) {
 
 
 kimchi.setDefaultNetworkType = function(isInterfaceAvail) {
-    $("#networkType").val('bridged', isInterfaceAvail);
+    $("#networkType").val('macvtap', isInterfaceAvail);
     $("#networkType option:contains('bridged')").prop("disabled", !isInterfaceAvail);
     $("#networkType").val('nat', !isInterfaceAvail);
     $("#networkType").selectpicker();
@@ -151,7 +151,7 @@ kimchi.setupNetworkFormEvent = function() {
         var selectedType = $(this).val();
         if(selectedType ==  'isolated' ||  selectedType ==  'nat') {
             kimchi.enableBridgeOptions(false);
-        } else if (selectedType ==  'bridged') {
+        } else if (selectedType ==  'macvtap') {
             kimchi.enableBridgeOptions(true);
         }
     }); 
diff --git a/ui/pages/network-add.html.tmpl b/ui/pages/network-add.html.tmpl
index 5a04d04..3b4682d 100644
--- a/ui/pages/network-add.html.tmpl
+++ b/ui/pages/network-add.html.tmpl
@@ -38,7 +38,7 @@
             <select id="networkType" class="selectpicker col-md-12 col-lg-12">
                 <option value="isolated">$_("Isolated: no external network connection")</option>
                 <option value="nat">$_("NAT: outbound physical network connection only")</option>
-                <option value="bridged">$_("Bridged: Virtual machines are connected to physical network directly")</option>
+                <option value="macvtap">$_("Bridged: Virtual machines are connected to physical network directly")</option>
             </select>
         </div>
         <div id="networkBriDisabledLabel" class="form-group hidden">
-- 
1.9.1