apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

for bug 6163 - change direct tagged IP range to no longer restrict it to an account.

Browse Source
This commit is contained in:
Jessica Wang 2010-09-23 15:24:47 -07:00
parent 320df380c9
commit a6ca920452
11 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/index.jsp
View File

@ -49,6 +49,15 @@ long milliseconds = new Date().getTime();
<script type="text/javascript" src="scripts/cloud.logger.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.init.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.templates.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.storage.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.network.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.hosts.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.instances.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.domains.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.events.js?t=<%=milliseconds%>"></script>
<script type="text/javascript" src="scripts/cloud.core.accounts.js?t=<%=milliseconds%>"></script>
<!-- Favicon -->
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />

1
ui/jsp/tab_accounts.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.accounts.js?t=<%=milliseconds%>"></script>
<!-- Accounts -->
<div class="maincontent" style="display:block;" id="submenu_content_account">

3
ui/jsp/tab_configuration.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
<!-- Content Panel -->
<!-- Submenu -->
@ -434,7 +433,7 @@ long milliseconds = new Date().getTime();
<input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan"/>
<div id="add_publicip_vlan_vlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li style="display:none" id="add_publicip_vlan_scope_container">
<li id="add_publicip_vlan_scope_container">
<label for="add_publicip_vlan_scope">Scope:</label>
<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
<option value="zone-wide">zone-wide</option>

1
ui/jsp/tab_domains.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.domains.js?t=<%=milliseconds%>"></script>
<!-- Content Panel -->
<div class="maincontent" style="display:block;" id="submenu_content_domains">

1
ui/jsp/tab_events.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.events.js?t=<%=milliseconds%>"></script>
<!-- Content Panel -->
<!-- Submenus -->

1
ui/jsp/tab_hosts.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.hosts.js?t=<%=milliseconds%>"></script>
<div class="maincontent" id="submenu_content_routing" style="display:block">
<div id="maincontent_title">

1
ui/jsp/tab_instances.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.instances.js?t=<%=milliseconds%>"></script>
<!-- Content Panel -->
<!-- Submenu -->

2
ui/jsp/tab_networking.jsp
View File

@ -2,7 +2,7 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.network.js?t=<%=milliseconds%>"></script>
<!-- Content Panel -->
<!-- Submenus -->
<div class="submenu_links">

1
ui/jsp/tab_storage.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.storage.js?t=<%=milliseconds%>"></script>
<div class="submenu_links">
<div class="submenu_links_on" id="submenu_pool">

1
ui/jsp/tab_templates.jsp
View File

@ -2,7 +2,6 @@
<%
long milliseconds = new Date().getTime();
%>
<script type="text/javascript" src="scripts/cloud.core.templates.js?t=<%=milliseconds%>"></script>
<div class="submenu_links">
<div class="submenu_links_on" id="submenu_template">Template</div>

58
ui/scripts/cloud.core.configuration.js
View File

@ -701,10 +701,7 @@ function showConfigurationTab() {
isTagged = thisDialog.find("#add_publicip_vlan_tagged").val() == "tagged";
}
if (isDirect && isTagged)
isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), false); //required
else
isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
if (isTagged) {
isValid &= validateNumber("VLAN", thisDialog.find("#add_publicip_vlan_vlan"), thisDialog.find("#add_publicip_vlan_vlan_errormsg"), 2, 4095);
@ -721,15 +718,11 @@ function showConfigurationTab() {
} else {
vlan = "&vlan=untagged";
}
var directParams = "";
if (isDirect && isTagged) {
directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
} else if (isDirect && !isTagged) {
directParams = "&podId="+trim(thisDialog.find("#add_publicip_vlan_pod").val());
} else if (!isDirect && (dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")) { //public VLAN, account-specific
directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
}
var scopeParams = "";
if(dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")
scopeParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
var type = "true";
if (getNetworkType() == "vlan") type = trim(thisDialog.find("#add_publicip_vlan_type").val());
var gateway = trim(thisDialog.find("#add_publicip_vlan_gateway").val());
@ -751,7 +744,7 @@ function showConfigurationTab() {
template.fadeIn("slow");
$.ajax({
data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+directParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json"),
data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+scopeParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json"),
dataType: "json",
success: function(json) {
var vlan = json.createvlaniprangeresponse;
@ -1045,21 +1038,16 @@ function showConfigurationTab() {
dialogAddVlanForZone.find("#add_publicip_vlan_type").change(function(event) {
var addPublicipVlanTagged = dialogAddVlanForZone.find("#add_publicip_vlan_tagged").empty();
if ($(this).val() == "false") { //direct VLAN (only tagged option)
dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
if ($(this).val() == "false") { //direct VLAN (only tagged option)
addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
} else { //public VLAN
dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
} else { //public VLAN
addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');
if (dialogAddVlanForZone.find("#add_publicip_vlan_tagged") == "tagged") {
@ -1074,20 +1062,14 @@ function showConfigurationTab() {
});
if (getNetworkType() != "vnet") {
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)
dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
} else { //public VLAN
dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
if ($(this).val() == "tagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
@ -1102,7 +1084,7 @@ function showConfigurationTab() {
dialogAddVlanForZone.find("#add_publicip_vlan_container").hide();
}
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(function(event) {
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(function(event) {
if($(this).val() == "zone-wide") {
dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_account_container").hide();