diff --git a/src/sunstone/etc/sunstone-views/kvm/cloud.yaml b/src/sunstone/etc/sunstone-views/kvm/cloud.yaml
index d2c6c88173..ad0c760fe5 100644
--- a/src/sunstone/etc/sunstone-views/kvm/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/kvm/cloud.yaml
@@ -33,6 +33,11 @@ features:
# True to show the vCenter info (VM & VRouters)
show_vcenter_info: true
+
+ # True to show advanced options
+ show_attach_disk_advanced: true
+
+ show_attach_nic_advanced: true
tabs:
provision-tab:
panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/mixed/cloud.yaml b/src/sunstone/etc/sunstone-views/mixed/cloud.yaml
index d2c6c88173..ad0c760fe5 100644
--- a/src/sunstone/etc/sunstone-views/mixed/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/mixed/cloud.yaml
@@ -33,6 +33,11 @@ features:
# True to show the vCenter info (VM & VRouters)
show_vcenter_info: true
+
+ # True to show advanced options
+ show_attach_disk_advanced: true
+
+ show_attach_nic_advanced: true
tabs:
provision-tab:
panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml b/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml
index 20119066bc..1bbf4a7e06 100644
--- a/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/vcenter/cloud.yaml
@@ -33,6 +33,11 @@ features:
# True to show the vCenter info (VM & VRouters)
show_vcenter_info: true
+
+ # True to show advanced options
+ show_attach_disk_advanced: true
+
+ show_attach_nic_advanced: true
tabs:
provision-tab:
panel_tabs:
diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index 573d807dd5..fef5f30d3a 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -80,6 +80,14 @@ define(function(require) {
}
},
+ "isAdvancedEnabled": function(featureName) {
+ if (_config['view']['features'] && featureName in _config['view']['features']) {
+ return _config['view']['features'][featureName];
+ } else {
+ return true;
+ }
+ },
+
"tabTableColumns": function(tabName) {
if (!_config['view']['tabs'][tabName]) {
return [];
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
index b2e4b42b48..f9d211a11c 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
@@ -134,6 +134,10 @@ define(function(require) {
CreateUtils.setupPCIRows($(".pci-row", context));
$("input.pci-type-nic", context).change();
+
+ if (!Config.isAdvancedEnabled("show_attach_nic_advanced")){
+ $("#nic_values", context).hide();
+ }
}
function _retrieve(context) {
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
index 807c043018..6fffe79230 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
@@ -16,6 +16,7 @@
{{{vnetsTableSelectHTML}}}
+