diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index be5f2eb1781..a2f5edbe499 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -289,6 +289,7 @@ define(function(require) { var NIC_IP_ATTRS = [ "IP", + "IP6", "IP6_GLOBAL", "IP6_ULA", "VROUTER_IP", diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js index 01ba08faff3..1b2aab4480f 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js @@ -296,6 +296,8 @@ define(function(require) { var last_mac = ar.MAC_END; var first_ip = ar.IP; var last_ip = ar.IP_END; + var first_ip6_static= ar.IP6; + var last_ip6_static = ar.IP6_END; var first_ip6_global= ar.IP6_GLOBAL; var last_ip6_global = ar.IP6_GLOBAL_END; var first_ip6_ula = ar.IP6_ULA; @@ -317,6 +319,8 @@ define(function(require) { delete ar["IP_END"]; delete ar["IP6_ULA"]; delete ar["IP6_ULA_END"]; + delete ar["IP6"]; + delete ar["IP6_END"]; delete ar["IP6_GLOBAL"]; delete ar["IP6_GLOBAL_END"]; delete ar["AR_ID"]; @@ -364,6 +368,8 @@ define(function(require) { 'last_mac': last_mac, 'first_ip': first_ip, 'last_ip': last_ip, + 'first_ip6_static': first_ip6_static, + 'last_ip6_static': last_ip6_static, 'first_ip6_global': first_ip6_global, 'last_ip6_global': last_ip6_global, 'first_ip6_ula': first_ip6_ula, diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs index f2308e3815b..2feede976a6 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs @@ -78,6 +78,13 @@ {{last_ip6_global}} {{/if}} + {{#if first_ip6_static}} + + {{tr "IP6"}} + {{first_ip6_static}} + {{last_ip6_static}} + + {{/if}} {{#if first_ip6_ula}} {{tr "IP6_ULA"}} diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js index f4de5853b98..c5c39f395d2 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js @@ -103,6 +103,7 @@ define(function(require) { "col0HTML" : col0HTML, "col1HTML" : col1HTML, "IP" : lease.IP, + "IP6" : lease.IP6, "MAC" : lease.MAC, "IP6_LINK" : lease.IP6_LINK, "IP6_ULA" : lease.IP6_ULA, diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs index c91a50680a3..bae15a5c5c6 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs @@ -35,6 +35,7 @@ {{tr "IP"}} + {{tr "IPv6"}} {{tr "MAC"}} {{tr "IPv6 Link"}} {{tr "IPv6 ULA"}} @@ -48,6 +49,7 @@ {{{col0HTML}}} {{{col1HTML}}} {{valOrDefault IP "--"}} + {{valOrDefault IP6 "--"}} {{valOrDefault MAC "--"}} {{valOrDefault IP6_LINK "--"}} {{valOrDefault IP6_ULA "--"}} diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js index 684db7bbdb2..b0d6222b2b8 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js @@ -84,6 +84,20 @@ define(function(require) { } }); + $('input.slaac',ar_section).prop('checked',true); + $('.slaac_false', ar_section).hide(); + + $('input.slaac',ar_section).on('change', function(){ + var slaac = $(this).prop('checked'); + if(slaac){ + $('.slaac_true', ar_section).show(); + $('.slaac_false', ar_section).hide(); + }else{ + $('.slaac_true', ar_section).hide(); + $('.slaac_false', ar_section).show(); + } + }); + $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).prop('checked', true); $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).change(); @@ -111,9 +125,15 @@ define(function(require) { break; case "IP4_6": fields = $('div.type_ip4_6', this.ar_section).children("input"); + if(!$('input.slaac',this.ar_section).prop('checked')){ + ar_type += "_STATIC"; + } break; case "IP6": fields = $('div.type_ip6', this.ar_section).children("input"); + if(!$('input.slaac',this.ar_section).prop('checked')){ + ar_type += "_STATIC"; + } break; case "ETHER": fields = $('div.type_ether', this.ar_section).children("input"); diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs index 577b47023ca..aa1c9ae68b3 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs @@ -25,7 +25,7 @@
-
@@ -35,22 +35,41 @@
-
- - +
+
+ + +
+
+ + + +
-
+
- +
- +
+
+
+ + +
+
+ + +
+
{{#advancedSection (tr "Advanced Options") }}