apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6255

Browse Source 
UI for supporting region level VPC, distributed routing enabled VPC and
stretched L2 neworks
This commit is contained in:
Gabor Apati-Nagy 2014-04-24 15:02:31 -07:00 committed by Brian Federle
parent 1e0d6716ca
commit 156b08af5f
8 changed files with 805 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/WEB-INF/classes/resources/messages.properties
View File

@ -1284,6 +1284,18 @@ label.assign.instance.another=Assign Instance to Another Account
label.network.addVM=Add network to VM label.network.addVM=Add network to VM
label.set.default.NIC=Set default NIC label.set.default.NIC=Set default NIC
label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\+ label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\+
label.supportsstrechedl2subnet=Supports Streched L2 Subnet
label.menu.vpc.offerings=VPC Offerings
label.vpc.offering=VPC Offering
label.regionlevelvpc=Region Level VPC
label.add.vpc.offering=Add VPC Offering
label.distributedrouter=DistributedRouter
label.vpc.offering.details=VPC offering details
label.disable.vpc.offering=Disable VPC offering
label.enable.vpc.offering=Enable VPC offering
label.remove.vpc.offering=Remove VPC offering
label.vpc.distributedvpcrouter=Distributed VPC Router
label.vpc.supportsregionlevelvpc=Supports Region Level VPC
label.dynamically.scalable=Dynamically Scalable label.dynamically.scalable=Dynamically Scalable
label.instance.scaled.up=Instance Scaled Up label.instance.scaled.up=Instance Scaled Up
label.tag.key=Tag Key label.tag.key=Tag Key
@ -1891,6 +1903,11 @@ message.confirm.enable.network.offering=Are you sure you want to enable this net
message.enabling.network.offering=Enabling network offering message.enabling.network.offering=Enabling network offering
message.confirm.remove.network.offering=Are you sure you want to remove this network offering? message.confirm.remove.network.offering=Are you sure you want to remove this network offering?
message.confirm.disable.network.offering=Are you sure you want to disable this network offering? message.confirm.disable.network.offering=Are you sure you want to disable this network offering?
message.disabling.vpc.offering=Disabling VPC offering
message.confirm.enable.vpc.offering=Are you sure you want to enable this VPC offering?
message.enabling.vpc.offering=Enabling VPC offering
message.confirm.remove.vpc.offering=Are you sure you want to remove this VPC offering?
message.confirm.disable.vpc.offering=Are you sure you want to disable this VPC offering?
mode=Mode mode=Mode
network.rate=Network Rate network.rate=Network Rate
notification.reboot.instance=Reboot instance notification.reboot.instance=Reboot instance

18
ui/dictionary.jsp
View File

@ -1865,5 +1865,23 @@ dictionary = {
'message.enabling.network.offering': '<fmt:message key="message.enabling.network.offering" />', 'message.enabling.network.offering': '<fmt:message key="message.enabling.network.offering" />',
'message.confirm.remove.network.offering': '<fmt:message key="message.confirm.remove.network.offering" />', 'message.confirm.remove.network.offering': '<fmt:message key="message.confirm.remove.network.offering" />',
'message.confirm.disable.network.offering': '<fmt:message key="message.confirm.disable.network.offering" />', 'message.confirm.disable.network.offering': '<fmt:message key="message.confirm.disable.network.offering" />',
'label.supportsstrechedl2subnet': '<fmt:message key="label.supportsstrechedl2subnet" />',
'label.menu.vpc.offerings': '<fmt:message key="label.menu.vpc.offerings" />',
'label.vpc.offering': '<fmt:message key="label.vpc.offering" />',
'label.add.vpc.offering': '<fmt:message key="label.add.vpc.offering" />',
'label.distributedrouter': '<fmt:message key="label.distributedrouter" />',
'label.regionlevelvpc': '<fmt:message key="label.regionlevelvpc" />',
'label.vpc.offering.details': '<fmt:message key="label.vpc.offering.details" />',
'label.disable.vpc.offering': '<fmt:message key="label.disable.vpc.offering" />',
'label.enable.vpc.offering': '<fmt:message key="label.enable.vpc.offering" />',
'label.remove.vpc.offering': '<fmt:message key="label.remove.vpc.offering" />',
'label.vpc.distributedvpcrouter': '<fmt:message key="label.vpc.distributedvpcrouter" />',
'label.vpc.supportsregionlevelvpc': '<fmt:message key="label.vpc.supportsregionlevelvpc" />',
'message.disabling.vpc.offering': '<fmt:message key="message.disabling.vpc.offering" />',
'message.confirm.enable.vpc.offering': '<fmt:message key="message.confirm.enable.vpc.offering" />',
'message.enabling.vpc.offering': '<fmt:message key="message.enabling.vpc.offering" />',
'message.confirm.remove.vpc.offering': '<fmt:message key="message.confirm.remove.vpc.offering" />',
'message.confirm.disable.vpc.offering': '<fmt:message key="message.confirm.disable.vpc.offering" />'
}; };
</script> </script>

716
ui/scripts/configuration.js
View File

@ -525,17 +525,17 @@
//custom fields (begin) //custom fields (begin)
if (args.$form.find('.form-item[rel=cpuNumber]').css("display") != "none") { if (args.$form.find('.form-item[rel=cpuNumber]').css("display") != "none") {
$.extend(data, { $.extend(data, {
cpuNumber: args.data.cpuNumber cpuNumber: args.data.cpuNumber
}); });
} }
if (args.$form.find('.form-item[rel=cpuSpeed]').css("display") != "none") { if (args.$form.find('.form-item[rel=cpuSpeed]').css("display") != "none") {
$.extend(data, { $.extend(data, {
cpuSpeed: args.data.cpuSpeed cpuSpeed: args.data.cpuSpeed
}); });
} }
if (args.$form.find('.form-item[rel=memory]').css("display") != "none") { if (args.$form.find('.form-item[rel=memory]').css("display") != "none") {
$.extend(data, { $.extend(data, {
memory: args.data.memory memory: args.data.memory
}); });
} }
//custom fields (end) //custom fields (end)
@ -799,9 +799,9 @@
memory: { memory: {
label: 'label.memory.mb', label: 'label.memory.mb',
converter: function(args) { converter: function(args) {
if (args == undefined) if (args == undefined)
return ''; return '';
else else
return cloudStack.converters.convertBytes(args * 1024 * 1024); return cloudStack.converters.convertBytes(args * 1024 * 1024);
} }
}, },
@ -903,9 +903,9 @@
var item = json.listserviceofferingsresponse.serviceoffering[0]; var item = json.listserviceofferingsresponse.serviceoffering[0];
if (item.deploymentplanner != null && item.serviceofferingdetails != null) { if (item.deploymentplanner != null && item.serviceofferingdetails != null) {
if (item.deploymentplanner == 'ImplicitDedicationPlanner' && item.serviceofferingdetails.ImplicitDedicationMode != null) { if (item.deploymentplanner == 'ImplicitDedicationPlanner' && item.serviceofferingdetails.ImplicitDedicationMode != null) {
item.plannerMode = item.serviceofferingdetails.ImplicitDedicationMode; item.plannerMode = item.serviceofferingdetails.ImplicitDedicationMode;
} }
} }
if (item.serviceofferingdetails != null) { if (item.serviceofferingdetails != null) {
@ -1386,9 +1386,9 @@
memory: { memory: {
label: 'label.memory.mb', label: 'label.memory.mb',
converter: function(args) { converter: function(args) {
if (args == undefined) if (args == undefined)
return ''; return '';
else else
return cloudStack.converters.convertBytes(args * 1024 * 1024); return cloudStack.converters.convertBytes(args * 1024 * 1024);
} }
}, },
@ -2130,6 +2130,7 @@
var $lbType = args.$form.find('.form-item[rel=lbType]'); var $lbType = args.$form.find('.form-item[rel=lbType]');
var $serviceofferingid = args.$form.find('.form-item[rel=serviceofferingid]'); var $serviceofferingid = args.$form.find('.form-item[rel=serviceofferingid]');
var $conservemode = args.$form.find('.form-item[rel=conservemode]'); var $conservemode = args.$form.find('.form-item[rel=conservemode]');
var $supportsstrechedl2subnet = args.$form.find('.form-item[rel=supportsstrechedl2subnet]');
var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]'); var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]');
var hasAdvancedZones = false; var hasAdvancedZones = false;
@ -2277,7 +2278,7 @@
/* /*
when service(s) has VPC Virtual Router as provider: when service(s) has VPC Virtual Router as provider:
(1) conserve mode is set to unchecked and grayed out. (1) conserve mode is set to unchecked and grayed out.
(2) redundant router capability checkbox is set to unchecked and grayed out. (2) redundant router capability checkbox is set to unchecked and grayed out.
(3) remove Firewall service, SecurityGroup service. (3) remove Firewall service, SecurityGroup service.
@ -2309,43 +2310,43 @@
//CS-16612 show all services regardless of guestIpType(Shared/Isolated) //CS-16612 show all services regardless of guestIpType(Shared/Isolated)
/* /*
//hide/show service fields ***** (begin) ***** //hide/show service fields ***** (begin) *****
var serviceFieldsToHide = []; var serviceFieldsToHide = [];
if($guestTypeField.val() == 'Shared') { //Shared network offering if($guestTypeField.val() == 'Shared') { //Shared network offering
serviceFieldsToHide = [ serviceFieldsToHide = [
'service.SourceNat.isEnabled', 'service.SourceNat.isEnabled',
'service.PortForwarding.isEnabled', 'service.PortForwarding.isEnabled',
'service.Firewall.isEnabled', 'service.Firewall.isEnabled',
'service.Vpn.isEnabled' 'service.Vpn.isEnabled'
]; ];
if(havingVpcVirtualRouterForAtLeastOneService == true) { //add SecurityGroup to to-hide-list if(havingVpcVirtualRouterForAtLeastOneService == true) { //add SecurityGroup to to-hide-list
serviceFieldsToHide.push('service.SecurityGroup.isEnabled'); serviceFieldsToHide.push('service.SecurityGroup.isEnabled');
} }
else { //remove SecurityGroup from to-hide-list else { //remove SecurityGroup from to-hide-list
var temp = $.map(serviceFieldsToHide, function(item) { var temp = $.map(serviceFieldsToHide, function(item) {
if (item != 'service.SecurityGroup.isEnabled') { if (item != 'service.SecurityGroup.isEnabled') {
return item; return item;
} }
}); });
serviceFieldsToHide = temp; serviceFieldsToHide = temp;
} }
} }
else { //Isolated network offering else { //Isolated network offering
serviceFieldsToHide = [ serviceFieldsToHide = [
'service.SecurityGroup.isEnabled' 'service.SecurityGroup.isEnabled'
]; ];
if(havingVpcVirtualRouterForAtLeastOneService == true) { //add firewall to to-hide-list if(havingVpcVirtualRouterForAtLeastOneService == true) { //add firewall to to-hide-list
serviceFieldsToHide.push('service.Firewall.isEnabled'); serviceFieldsToHide.push('service.Firewall.isEnabled');
} }
else { //remove firewall from to-hide-list else { //remove firewall from to-hide-list
var temp = $.map(serviceFieldsToHide, function(item) { var temp = $.map(serviceFieldsToHide, function(item) {
if (item != 'service.Firewall.isEnabled') { if (item != 'service.Firewall.isEnabled') {
return item; return item;
} }
}); });
serviceFieldsToHide = temp; serviceFieldsToHide = temp;
} }
} }
*/ */
@ -2433,6 +2434,13 @@
args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').hide(); args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').hide();
args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').find('input[type=checkbox]').attr('checked', false); args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').find('input[type=checkbox]').attr('checked', false);
} }
//StretchedL2Subnet checkbox should be displayed only when 'Connectivity' service is checked
if (args.$form.find('.form-item[rel=\"service.Connectivity.isEnabled\"]').find('input[type=checkbox]').is(':checked')) {
$supportsstrechedl2subnet.css('display', 'inline-block');
} else {
$supportsstrechedl2subnet.hide();
}
}); });
args.$form.change(); args.$form.change();
@ -2470,7 +2478,7 @@
}); });
} }
}, },
*/ */
guestIpType: { guestIpType: {
label: 'label.guest.type', label: 'label.guest.type',
@ -2806,6 +2814,12 @@
}, },
//show or hide upon checked services and selected providers above (end) //show or hide upon checked services and selected providers above (end)
supportsstrechedl2subnet: {
label: 'label.supportsstrechedl2subnet',
isBoolean: true,
isChecked: false,
isHidden: true
},
conservemode: { conservemode: {
label: 'label.conserve.mode', label: 'label.conserve.mode',
@ -2908,7 +2922,7 @@
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'lbSchemes'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'lbSchemes';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = 'internal'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = 'internal';
serviceCapabilityIndex++; serviceCapabilityIndex++;
} }
} else if (value != '') { // Normal data } else if (value != '') { // Normal data
inputData[key] = value; inputData[key] = value;
} }
@ -2916,7 +2930,7 @@
for (var key1 in inputData) { for (var key1 in inputData) {
/* When capability ElasticIp=true is passed to API, if capability associatePublicIP is not passed to API, cloudStack API will assume associatePublicIP=true. /* When capability ElasticIp=true is passed to API, if capability associatePublicIP is not passed to API, cloudStack API will assume associatePublicIP=true.
So, UI has to explicitly pass associatePublicIP=false to API if its checkbox is unchecked. */ So, UI has to explicitly pass associatePublicIP=false to API if its checkbox is unchecked. */
if (inputData[key1] == 'ElasticIp') { //ElasticIp checkbox is checked if (inputData[key1] == 'ElasticIp') { //ElasticIp checkbox is checked
var associatePublicIPExists = false; var associatePublicIPExists = false;
for (var key2 in inputData) { for (var key2 in inputData) {
@ -2930,11 +2944,25 @@
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'StaticNat'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'StaticNat';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'associatePublicIP'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'associatePublicIP';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = false; //associatePublicIP checkbox is unchecked inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = false; //associatePublicIP checkbox is unchecked
serviceCapabilityIndex++;
} }
break; //break key1 for loop break; //break key1 for loop
} }
} }
//passing supportsstrechedl2subnet's value as capability
for (var k in inputData) {
if (k == 'supportsstrechedl2subnet' && ("Connectivity" in serviceProviderMap)) {
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'Connectivity';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'StretchedL2Subnet';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true;
serviceCapabilityIndex++;
break;
}
}
//removing supportsstrechedl2subnet from parameters, it has been set as capability
delete inputData['supportsstrechedl2subnet'];
// Make supported services list // Make supported services list
inputData['supportedServices'] = $.map(serviceProviderMap, function(value, key) { inputData['supportedServices'] = $.map(serviceProviderMap, function(value, key) {
return key; return key;
@ -3269,6 +3297,10 @@
traffictype: { traffictype: {
label: 'label.traffic.type' label: 'label.traffic.type'
}, },
supportsstrechedl2subnet: {
label: 'label.supportsstrechedl2subnet',
converter: cloudStack.converters.toBooleanText
},
supportedServices: { supportedServices: {
label: 'label.supported.services' label: 'label.supported.services'
}, },
@ -3294,6 +3326,561 @@
return service.name; return service.name;
}).join(', '), }).join(', '),
serviceCapabilities: $.map(item.service, function(service) {
return service.provider ? $.map(service.provider, function(capability) {
return service.name + ': ' + capability.name;
}).join(', ') : null;
}).join(', ')
})
});
}
});
}
}
}
}
}
},
vpcOfferings: {
type: 'select',
title: 'label.menu.vpc.offerings',
listView: {
id: 'vpcOfferings',
label: 'label.menu.vpc.offerings',
fields: {
name: {
label: 'label.name'
},
state: {
label: 'label.state',
indicator: {
'Enabled': 'on',
'Disabled': 'off',
'Destroyed': 'off'
}
}
},
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
$.ajax({
url: createURL('listVPCOfferings'),
data: data,
success: function(json) {
var items = json.listvpcofferingsresponse.vpcoffering;
args.response.success({
actionFilter: vpcOfferingActionfilter,
data: items
});
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
},
actions: {
add: {
label: 'label.add.vpc.offering',
createForm: {
title: 'label.add.vpc.offering',
preFilter: function(args) {
var hasAdvancedZones = false;
// Check whether there are any advanced zones
$.ajax({
url: createURL('listZones'),
data: {
listAll: true
},
async: false,
success: function(json) {
var zones = json.listzonesresponse.zone;
if (zones != null && zones.length > 0) {
for (var i = 0; i < zones.length; i++) {
if (zones[i].networktype == "Advanced")
hasAdvancedZones = true;
}
}
}
});
args.$form.bind('change', function() { //when any field in the dialog is changed
var $providers = args.$form.find('.dynamic-input select');
var $optionsOfProviders = $providers.find('option');
$providers.each(function() {
//if selected option is disabled, select the first enabled option instead
if ($(this).find('option:selected:disabled').length > 0) {
$(this).val($(this).find('option:first'));
}
});
});
args.$form.change();
},
fields: {
name: {
label: 'label.name',
validation: {
required: true
},
docID: 'helpVpcOfferingName'
},
displayText: {
label: 'label.description',
validation: {
required: true
},
docID: 'helpVpcOfferingDescription'
},
supportedServices: {
label: 'label.supported.services',
dynamic: function(args) {
var networkServiceObjs = [];
networkServiceObjs.push({
name: 'Dhcp',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'Dns',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'Lb',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'Gateway',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'StaticNat',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'SourceNat',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'NetworkACL',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'PortForwarding',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'UserData',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'Vpn',
provider: [{name: 'VpcVirtualRouter'}]
});
networkServiceObjs.push({
name: 'Connectivity',
provider: [
{name: 'NiciraNvp'},
{name: 'Ovs'},
{name: 'JuniperContrailVpcRouter'}
]
});
serviceFields = [];
var fields = {};
$(networkServiceObjs).each(function() {
var serviceName = this.name;
var providerObjs = this.provider;
var serviceDisplayName;
// Sanitize names
switch (serviceName) {
case 'Vpn':
serviceDisplayName = dictionary['label.vpn'];
break;
case 'Dhcp':
serviceDisplayName = dictionary['label.dhcp'];
break;
case 'Dns':
serviceDisplayName = dictionary['label.dns'];
break;
case 'Lb':
serviceDisplayName = dictionary['label.load.balancer'];
break;
case 'SourceNat':
serviceDisplayName = dictionary['label.source.nat'];
break;
case 'StaticNat':
serviceDisplayName = dictionary['label.static.nat'];
break;
case 'PortForwarding':
serviceDisplayName = dictionary['label.port.forwarding'];
break;
case 'UserData':
serviceDisplayName = dictionary['label.user.data'];
break;
default:
serviceDisplayName = serviceName;
break;
}
var id = {
isEnabled: 'service' + '.' + serviceName + '.' + 'isEnabled',
capabilities: 'service' + '.' + serviceName + '.' + 'capabilities',
provider: 'service' + '.' + serviceName + '.' + 'provider'
};
serviceCheckboxNames.push(id.isEnabled);
fields[id.isEnabled] = {
label: serviceDisplayName,
isBoolean: true,
};
serviceFields.push(id.isEnabled);
fields[id.provider] = {
label: serviceDisplayName + ' Provider',
isHidden: true,
dependsOn: id.isEnabled,
select: function(args) {
var items = [];
$(providerObjs).each(function() {
items.push({
id: this.name,
description: this.name
});
});
args.response.success({
data: items
});
}
}
});
args.response.success({
fields: fields
});
}
}, //end of supportedservices field
"service.Connectivity.regionLevelVpcCapabilityCheckbox": {
label: 'label.regionlevelvpc',
isHidden: true,
dependsOn: 'service.Connectivity.isEnabled',
isBoolean: true
},
"service.Connectivity.distributedRouterCapabilityCheckbox": {
label: 'label.distributedrouter',
isHidden: true,
dependsOn: 'service.Connectivity.isEnabled',
isBoolean: true
}
},//end of fields
}, //end of createForm
action: function(args) {
var formData = args.data;
var inputData = {};
var serviceProviderMap = {};
var serviceCapabilityIndex = 0;
$.each(formData, function(key, value) {
var serviceData = key.split('.');
if (serviceData.length > 1) {
if (serviceData[0] == 'service' &&
serviceData[2] == 'isEnabled' &&
value == 'on') { // Services field
serviceProviderMap[serviceData[1]] = formData[
'service.' + serviceData[1] + '.provider'
];
} else if ((key == 'service.Connectivity.regionLevelVpcCapabilityCheckbox') && ("Connectivity" in serviceProviderMap)) {
inputData['serviceCapabilityList[' + serviceCapabilityIndex + '].service'] = 'Connectivity';
inputData['serviceCapabilityList[' + serviceCapabilityIndex + '].capabilitytype'] = "RegionLevelVpc";
inputData['serviceCapabilityList[' + serviceCapabilityIndex + '].capabilityvalue'] = true;
serviceCapabilityIndex++;
} else if ((key == 'service.Connectivity.distributedRouterCapabilityCheckbox') && ("Connectivity" in serviceProviderMap)) {
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'Connectivity';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'DistributedRouter';
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true;
serviceCapabilityIndex++;
}
} else if (value != '') { // Normal data
inputData[key] = value;
}
});
// Make supported services list
inputData['supportedServices'] = $.map(serviceProviderMap, function(value, key) {
return key;
}).join(',');
// Make service provider map
var serviceProviderIndex = 0;
$.each(serviceProviderMap, function(key, value) {
inputData['serviceProviderList[' + serviceProviderIndex + '].service'] = key;
inputData['serviceProviderList[' + serviceProviderIndex + '].provider'] = value;
serviceProviderIndex++;
});
$.ajax({
url: createURL('createVPCOffering'),
data: inputData,
dataType: 'json',
async: true,
success: function(data) {
var item = data.createvpcofferingresponse;
args.response.success({
data: item,
actionFilter: vpcOfferingActionfilter
});
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
},
notification: {
poll: function(args) {
args.complete({
actionFilter: vpcOfferingActionfilter
});
}
},
messages: {
notification: function(args) {
return 'Added VPC offering';
}
}
}
},
reorder: cloudStack.api.actions.sort('updateVPCOffering', 'vpcOfferings'),
detailView: {
name: 'label.vpc.offering.details',
actions: {
edit: {
label: 'label.edit',
action: function(args) {
var data = {
id: args.context.vpcOfferings[0].id,
name: args.data.name,
displaytext: args.data.displaytext,
availability: args.data.availability
};
$.ajax({
url: createURL('updateVPCOffering'),
data: data,
success: function(json) {
var item = json.updatevpcofferingresponse.vpcoffering;
args.response.success({
data: item
});
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
}
},
enable: {
label: 'label.enable.vpc.offering',
messages: {
confirm: function(args) {
return 'message.confirm.enable.vpc.offering';
},
notification: function(args) {
return 'message.enabling.vpc.offering';
}
},
action: function(args) {
$.ajax({
url: createURL("updateVPCOffering&id=" + args.context.vpcOfferings[0].id + "&state=Enabled"),
dataType: "json",
async: true,
success: function(json) {
var item = json.updatevpcofferingresponse.vpcoffering;
args.response.success();
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
},
notification: {
poll: function(args) {
args.complete({
data: {
state: 'Enabled'
}
});
}
}
},
disable: {
label: 'label.disable.vpc.offering',
messages: {
confirm: function(args) {
return 'message.confirm.disable.vpc.offering';
},
notification: function(args) {
return 'message.disabling.vpc.offering';
}
},
action: function(args) {
$.ajax({
url: createURL("updateVPCOffering&id=" + args.context.vpcOfferings[0].id + "&state=Disabled"),
dataType: "json",
async: true,
success: function(json) {
var item = json.updatevpcofferingresponse.vpcoffering;
args.response.success();
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
},
notification: {
poll: function(args) {
args.complete({
data: {
state: 'Disabled'
}
});
}
}
},
remove: {
label: 'label.remove.vpc.offering',
action: function(args) {
$.ajax({
url: createURL('deleteVPCOffering'),
data: {
id: args.context.vpcOfferings[0].id
},
success: function(json) {
args.response.success();
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
}
});
},
messages: {
confirm: function() {
return 'message.confirm.remove.vpc.offering';
},
notification: function() {
return 'label.remove.vpc.offering';
}
},
notification: {
poll: function(args) {
args.complete({
data: {
state: 'Destroyed'
},
actionFilter: vpcOfferingActionfilter
});
}
}
}
},
tabs: {
details: {
title: 'label.details',
fields: [{
name: {
label: 'label.name',
isEditable: true,
validation: {
required: true
}
}
}, {
id: {
label: 'label.id'
},
displaytext: {
label: 'label.description',
isEditable: true,
validation: {
required: true
}
},
state: {
label: 'label.state'
},
isdefault: { //created by system by default
label: 'label.created.by.system',
converter: cloudStack.converters.toBooleanText
},
supportedServices: {
label: 'label.supported.services'
},
serviceCapabilities: {
label: 'label.service.capabilities'
},
distributedvpcrouter: {
label: 'label.vpc.distributedvpcrouter',
converter: cloudStack.converters.toBooleanText
},
supportsregionLevelvpc: {
label: 'label.vpc.supportsregionlevelvpc',
converter: cloudStack.converters.toBooleanText
},
serviceCapabilities: {
label: 'label.service.capabilities'
},
tags: {
label: 'label.tags'
}
}],
dataProvider: function(args) {
$.ajax({
url: createURL('listVPCOfferings&id=' + args.context.vpcOfferings[0].id),
dataType: "json",
async: true,
success: function(json) {
var item = json.listvpcofferingsresponse.vpcoffering[0];
args.response.success({
actionFilter: vpcOfferingActionfilter,
data: $.extend(item, {
supportedServices: $.map(item.service, function(service) {
return service.name;
}).join(', '),
serviceCapabilities: $.map(item.service, function(service) { serviceCapabilities: $.map(item.service, function(service) {
return service.provider ? $.map(service.provider, function(capability) { return service.provider ? $.map(service.provider, function(capability) {
return service.name + ': ' + capability.name; return service.name + ': ' + capability.name;
@ -3310,7 +3897,8 @@
} }
} }
} }
}; }
var serviceOfferingActionfilter = function(args) { var serviceOfferingActionfilter = function(args) {
var jsonObj = args.context.item; var jsonObj = args.context.item;
@ -3356,4 +3944,24 @@
return allowedActions; return allowedActions;
}; };
var vpcOfferingActionfilter = function(args) {
var jsonObj = args.context.item;
if (jsonObj.state == 'Destroyed')
return [];
var allowedActions = [];
allowedActions.push("edit");
if (jsonObj.state == "Enabled")
allowedActions.push("disable");
else if (jsonObj.state == "Disabled")
allowedActions.push("enable");
if (jsonObj.isdefault == false)
allowedActions.push("remove");
return allowedActions;
};
})(cloudStack, jQuery); })(cloudStack, jQuery);

8
ui/scripts/docs.js
View File

@ -1219,5 +1219,13 @@ cloudStack.docs = {
helpLdapGroupName: { helpLdapGroupName: {
desc: 'The group name from which you want to import LDAP users', desc: 'The group name from which you want to import LDAP users',
externalLink: '' externalLink: ''
},
helpVpcOfferingName: {
desc: 'Any desired name for the VPC offering',
externalLink: ''
},
helpVpcOfferingDescription: {
desc: 'A short description of the offering that can be displayed to users',
externalLink: ''
} }
}; };

62
ui/scripts/network.js
View File

@ -5178,7 +5178,16 @@
url: createURL('listVPCs'), url: createURL('listVPCs'),
data: data, data: data,
success: function(json) { success: function(json) {
var items = json.listvpcsresponse.vpc; var items = json.listvpcsresponse.vpc ? json.listvpcsresponse.vpc : { };
//If we are coming from Home > Regions, show only regional vpcs
if (args.context.regions)
items = $.grep(
items,
function (vpc, i) {
return vpc.regionlevelvpc;
});
args.response.success({ args.response.success({
data: items data: items
}); });
@ -5272,30 +5281,49 @@
data: items data: items
}); });
} }
},
vpcoffering: {
label: 'label.vpc.offering',
validation: {
required: true
},
select: function(args) {
var data = {
listAll: true
};
$.ajax({
url: createURL('listVPCOfferings'),
data: {
listAll: true
},
success: function(json) {
var offerings = json.listvpcofferingsresponse.vpcoffering ? json.listvpcofferingsresponse.vpcoffering : [];
var filteredofferings = $.grep(offerings, function(offering) {
return offering.state == 'Enabled';
});
args.response.success({
data: $.map(filteredofferings, function(vpco) {
return {
id: vpco.id,
description: vpco.name
};
})
});
}
});
}
} }
} }
}, },
action: function(args) { action: function(args) {
var vpcOfferingName; var vpcOfferingName = args.data.vpcoffering
if (args.data.publicLoadBalancerProvider == 'VpcVirtualRouter')
vpcOfferingName = 'Default VPC offering';
else if (args.data.publicLoadBalancerProvider == 'Netscaler')
vpcOfferingName = 'Default VPC offering with Netscaler';
$.ajax({
url: createURL('listVPCOfferings'),
data: {
name: vpcOfferingName
},
success: function(json) {
var vpcofferingid = json.listvpcofferingsresponse.vpcoffering[0].id;
var dataObj = { var dataObj = {
name: args.data.name, name: args.data.name,
displaytext: args.data.displaytext, displaytext: args.data.displaytext,
zoneid: args.data.zoneid, zoneid: args.data.zoneid,
cidr: args.data.cidr, cidr: args.data.cidr,
vpcofferingid: vpcofferingid vpcofferingid: args.data.vpcoffering
}; };
if (args.data.networkdomain != null && args.data.networkdomain.length > 0) if (args.data.networkdomain != null && args.data.networkdomain.length > 0)
@ -5323,8 +5351,6 @@
args.response.error(parseXMLHttpResponse(data)); args.response.error(parseXMLHttpResponse(data));
} }
}); });
}
});
}, },
notification: { notification: {

3
ui/scripts/regions.js
View File

@ -147,6 +147,9 @@
viewAll: [{ viewAll: [{
path: 'regions.GSLB', path: 'regions.GSLB',
label: 'GSLB' label: 'GSLB'
}, {
path: 'network.vpc',
label: 'label.regionlevelvpc'
}, { }, {
path: 'regions.portableIpRanges', path: 'regions.portableIpRanges',
label: 'Portable IP', label: 'Portable IP',

5
ui/scripts/ui/dialog.js
View File

@ -223,7 +223,10 @@
}); });
if ($dependsOn.is('[type=checkbox]')) { if ($dependsOn.is('[type=checkbox]')) {
var isReverse = args.form.fields[dependsOn].isReverse;
var isReverse = false;
if (args.form.fields[dependsOn])
isReverse = args.form.fields[dependsOn].isReverse;
// Checkbox // Checkbox
$dependsOn.bind('click', function(event) { $dependsOn.bind('click', function(event) {

50
ui/scripts/vpc.js
View File

@ -3955,13 +3955,51 @@
} }
}); });
} }
},
zoneid: {
label: 'label.zone',
validation: {
required: true
},
isHidden: true,
select: function(args) {
//var $zoneSelect = $(".ui-dialog-content").find('select.zoneid');
var $zoneSelect = args.$select.closest('form').find('[rel=zoneid]');
if (!args.context.regions) {
$zoneSelect.hide();
args.response.success({
data: []
});
}
else {
$zoneSelect.css('display', 'inline-block');
$.ajax({
url: createURL('listZones'),
success: function(json) {
var zones = $.grep(json.listzonesresponse.zone, function(zone) {
return (zone.networktype == 'Advanced');
});
args.response.success({
data: $.map(zones, function(zone) {
return {
id: zone.id,
description: zone.name
};
})
});
}
});
}
}
} }
} }
}, },
action: function(args) { action: function(args) {
var dataObj = { var dataObj = {
zoneId: args.context.vpc[0].zoneid,
vpcid: args.context.vpc[0].id, vpcid: args.context.vpc[0].id,
domainid: args.context.vpc[0].domainid, domainid: args.context.vpc[0].domainid,
account: args.context.vpc[0].account, account: args.context.vpc[0].account,
@ -3972,6 +4010,16 @@
netmask: args.data.netmask netmask: args.data.netmask
}; };
if (args.context.regions)
$.extend(dataObj, {
zoneId: args.data.zoneid
})
else
$.extend(dataObj, {
zoneId: args.context.vpc[0].zoneid
});
if (args.data.aclid != '') if (args.data.aclid != '')
$.extend(dataObj, { $.extend(dataObj, {
aclid: args.data.aclid aclid: args.data.aclid