You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/19 19:27:50 UTC
[01/23] git commit: updated refs/heads/master to fc08c23
Updated Branches:
refs/heads/master 4a3a9dfbc -> fc08c2372
Add zone filter drop-down to header (needs styling)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b853ccd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b853ccd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b853ccd
Branch: refs/heads/master
Commit: 4b853ccdc74ba7f247d48a604e8fb0d7051ee528
Parents: 7efbcfa
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 13:09:43 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 13:09:43 2013 -0700
----------------------------------------------------------------------
ui/index.jsp | 1 +
ui/scripts/ui-custom/zoneFilter.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b853ccd/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 3b8f378..003790e 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1659,6 +1659,7 @@ under the License.
<script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b853ccd/ui/scripts/ui-custom/zoneFilter.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneFilter.js b/ui/scripts/ui-custom/zoneFilter.js
new file mode 100644
index 0000000..d298e4f
--- /dev/null
+++ b/ui/scripts/ui-custom/zoneFilter.js
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+ $(window).bind('cloudStack.ready', function() {
+ var $header = $('#header .controls');
+ var $zoneFilter = $('<div>').addClass('zone-filter');
+ var $zoneTypeSelect = $('<select>').append(
+ $('<option>').attr('value', 'basic').html(_l('Basic')),
+ $('<option>').attr('value', 'advanced').html(_l('Advanced'))
+ );
+
+ $zoneTypeSelect.appendTo($zoneFilter);
+ $zoneFilter.insertAfter($header.find('#user'));
+ });
+}(jQuery, cloudStack));
+
[07/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Project switcher: Add label
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c529c5a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c529c5a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c529c5a1
Branch: refs/heads/master
Commit: c529c5a18d7f18a72cf2d2de6368526966a6ac3e
Parents: aa5ed0a
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 14:42:22 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 14:43:52 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 9 ++++++++-
ui/scripts/ui-custom/projectSelect.js | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c529c5a1/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bf3cfb5..61e5ab4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8913,6 +8913,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
padding: 9px 17px 0 0;
}
+.project-switcher label {
+ position: absolute;
+ top: -2px;
+ color: #FFFFFF;
+ font-size: 11px;
+}
+
.project-switcher select {
width: 100%;
font-size: 12px;
@@ -11390,7 +11397,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
border-bottom: 1px solid #FFFFFF;
height: 28px;
float: left;
- margin: 4px 13px 0 0;
+ margin: 5px 13px 0 0;
cursor: pointer;
/*+box-shadow:inset 0px 1px 1px #000000;*/
-moz-box-shadow: inset 0px 1px 1px #000000;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c529c5a1/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index ae3d8f9..f93fefc 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -23,8 +23,9 @@
$('<option>').attr('value', 'basic').html(_l('Project 1')),
$('<option>').attr('value', 'advanced').html(_l('Project 2'))
);
+ var $label = $('<label>').html('Project:');
- $projectSelect.appendTo($projectSwitcher);
+ $projectSwitcher.append($label, $projectSelect);
$projectSwitcher.insertBefore($header.find('.region-switcher'));
});
}(jQuery, cloudStack));
[16/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-new-project-switcher
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7489889
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7489889
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7489889
Branch: refs/heads/master
Commit: a7489889f28f824f664dd22d8e397ba51e45bddb
Parents: c529c5a 90e8158
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 11:02:14 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 11:02:14 2013 -0700
----------------------------------------------------------------------
DISCLAIMER | 7 -
.../agent/api/DeleteSnapshotBackupCommand.java | 6 +-
api/src/com/cloud/async/AsyncJob.java | 3 +-
.../cloud/configuration/ConfigurationService.java | 6 +
api/src/com/cloud/event/EventTypes.java | 12 +-
.../cloud/exception/AffinityConflictException.java | 34 +
api/src/com/cloud/network/Network.java | 15 +-
api/src/com/cloud/network/NetworkService.java | 2 +-
api/src/com/cloud/offering/NetworkOffering.java | 2 +
api/src/com/cloud/server/ManagementService.java | 4 +-
api/src/com/cloud/vm/DiskProfile.java | 2 +-
api/src/com/cloud/vm/UserVmService.java | 183 +-
.../apache/cloudstack/affinity/AffinityGroup.java | 31 +
.../affinity/AffinityGroupProcessor.java | 49 +
.../cloudstack/affinity/AffinityGroupResponse.java | 155 +
.../cloudstack/affinity/AffinityGroupService.java | 79 +
.../affinity/AffinityGroupTypeResponse.java | 48 +
.../cloudstack/affinity/AffinityProcessorBase.java | 44 +
.../org/apache/cloudstack/api/ApiConstants.java | 6 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 8 +-
.../apache/cloudstack/api/ResponseGenerator.java | 18 +-
.../command/admin/cluster/UpdateClusterCmd.java | 15 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 +
.../admin/offering/CreateServiceOfferingCmd.java | 7 +
.../admin/vlan/DedicatePublicIpRangeCmd.java | 108 +
.../admin/vlan/ReleasePublicIpRangeCmd.java | 77 +
.../command/user/address/AssociateIPAddrCmd.java | 31 +-
.../user/affinitygroup/CreateAffinityGroupCmd.java | 167 +
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 +
.../affinitygroup/ListAffinityGroupTypesCmd.java | 67 +
.../user/affinitygroup/ListAffinityGroupsCmd.java | 90 +
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 164 +
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 +
.../api/command/user/vm/DeployVMCmd.java | 41 +-
.../api/response/DeploymentPlannersResponse.java | 37 +
.../api/response/GlobalLoadBalancerResponse.java | 8 +
.../cloudstack/api/response/UserVmResponse.java | 14 +
.../network/ExternalNetworkDeviceManager.java | 1 +
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../com/cloud/bridge/service/EC2RestServlet.java | 2 +-
build/replace.properties | 1 +
client/pom.xml | 17 +-
client/tomcatconf/applicationContext.xml.in | 23 +-
client/tomcatconf/commands.properties.in | 20 +
client/tomcatconf/componentContext.xml.in | 20 +-
client/tomcatconf/nonossComponentContext.xml.in | 28 +
client/tomcatconf/simulatorComponentContext.xml.in | 30 +-
core/src/com/cloud/vm/VmDetailConstants.java | 1 +
debian/cloudstack-awsapi.install | 10 +-
debian/rules | 20 +-
docs/en-US/Admin_Guide.xml | 2 +-
docs/en-US/Book_Info.xml | 2 +-
docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +-
docs/en-US/Developers_Guide.xml | 2 +-
docs/en-US/Installation_Guide.xml | 2 +-
docs/en-US/Release_Notes.xml | 4413 ++++++++++++++-
docs/en-US/hypervisor-kvm-install-flow.xml | 1 +
docs/en-US/images/VMSnapshotButton.png | Bin 0 -> 967 bytes
docs/en-US/images/revert-vm.png | Bin 0 -> 860 bytes
docs/en-US/ipv6-support.xml | 4 +-
docs/en-US/virtual-machines.xml | 1 +
docs/en-US/vm-snapshots.xml | 146 +
.../subsystem/api/storage/CommandResult.java | 2 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 2 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 82 +-
.../platform/orchestration/CloudOrchestrator.java | 63 +-
.../driver/AncientImageDataStoreDriverImpl.java | 10 +-
.../image/motion/DefaultImageMotionStrategy.java | 4 +-
.../cloudstack/storage/test/DirectAgentTest.java | 4 +-
.../test/MockHypervisorHostEndPointRpcServer.java | 72 +
.../test/MockHypervsiorHostEndPointRpcServer.java | 72 -
.../integration-test/test/resource/component.xml | 2 +-
.../storage/snapshot/SnapshotObject.java | 2 +-
.../storage/HypervisorHostEndPointRpcServer.java | 119 +
.../storage/HypervsiorHostEndPointRpcServer.java | 119 -
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 2 +-
.../command/CreateVolumeFromBaseImageCommand.java | 6 +-
.../storage/datastore/DataObjectManagerImpl.java | 6 +-
.../provider/DataStoreProviderManagerImpl.java | 4 +-
.../storage/to/ImageOnPrimaryDataStoreTO.java | 44 +
.../storage/to/ImageOnPrimayDataStoreTO.java | 44 -
.../driver/DefaultPrimaryDataStoreDriverImpl.java | 4 +-
.../DefaultPrimaryDatastoreProviderImpl.java | 6 +-
.../volume/TemplateInstallStrategyImpl.java | 6 +-
packaging/centos63/cloud-usage.rc | 2 +-
packaging/centos63/cloud.spec | 14 +-
packaging/centos63/replace.properties | 2 +-
.../host-anti-affinity/pom.xml | 33 +
.../affinity/HostAntiAffinityProcessor.java | 93 +
.../cloudstack/syslog/AlertsSyslogAppender.java | 4 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 37 +-
.../vmware/manager/VmwareManagerImpl.java | 3 +-
.../hypervisor/vmware/resource/VmwareResource.java | 31 +-
.../xen/resource/XenServerStorageResource.java | 4 +-
plugins/network-elements/cisco-vnmc/pom.xml | 42 +
.../scripts/network/cisco/assoc-asa1000v.xml | 34 +
.../network/cisco/associate-acl-policy-set.xml | 37 +
.../network/cisco/associate-dhcp-policy.xml | 34 +
.../network/cisco/associate-dhcp-server.xml | 32 +
.../network/cisco/associate-nat-policy-set.xml | 35 +
.../network/cisco/associate-route-policy.xml | 33 +
.../network/cisco/create-acl-policy-ref.xml | 38 +
.../network/cisco/create-acl-policy-set.xml | 36 +
.../scripts/network/cisco/create-acl-policy.xml | 35 +
.../network/cisco/create-acl-rule-for-dnat.xml | 82 +
.../network/cisco/create-acl-rule-for-pf.xml | 156 +
.../scripts/network/cisco/create-dhcp-policy.xml | 72 +
.../scripts/network/cisco/create-dnat-rule.xml | 91 +
.../network/cisco/create-edge-device-profile.xml | 32 +
.../cisco/create-edge-device-route-policy.xml | 30 +
.../network/cisco/create-edge-device-route.xml | 35 +
.../scripts/network/cisco/create-edge-firewall.xml | 89 +
.../network/cisco/create-edge-security-profile.xml | 41 +
.../network/cisco/create-egress-acl-rule.xml | 201 +
.../cisco/create-generic-egress-acl-rule.xml | 122 +
.../cisco/create-generic-ingress-acl-rule.xml | 121 +
.../network/cisco/create-ingress-acl-rule.xml | 201 +
.../scripts/network/cisco/create-ip-pool.xml | 58 +
.../network/cisco/create-nat-policy-ref.xml | 38 +
.../network/cisco/create-nat-policy-set.xml | 37 +
.../scripts/network/cisco/create-nat-policy.xml | 33 +
.../scripts/network/cisco/create-pf-rule.xml | 166 +
.../scripts/network/cisco/create-port-pool.xml | 72 +
.../network/cisco/create-source-nat-pool.xml | 58 +
.../network/cisco/create-source-nat-rule.xml | 103 +
.../scripts/network/cisco/create-tenant.xml | 29 +
.../scripts/network/cisco/create-vdc.xml | 30 +
.../network/cisco/delete-acl-policy-set.xml | 30 +
.../scripts/network/cisco/delete-acl-policy.xml | 33 +
.../scripts/network/cisco/delete-edge-firewall.xml | 30 +
.../network/cisco/delete-edge-security-profile.xml | 38 +
.../network/cisco/delete-nat-policy-set.xml | 30 +
.../scripts/network/cisco/delete-nat-policy.xml | 33 +
.../scripts/network/cisco/delete-rule.xml | 31 +
.../scripts/network/cisco/delete-tenant.xml | 30 +
.../scripts/network/cisco/delete-vdc.xml | 30 +
.../scripts/network/cisco/disassoc-asa1000v.xml | 30 +
.../scripts/network/cisco/list-acl-policies.xml | 31 +
.../scripts/network/cisco/list-children.xml | 27 +
.../scripts/network/cisco/list-nat-policies.xml | 31 +
.../network/cisco/list-policyrefs-in-policyset.xml | 31 +
.../scripts/network/cisco/list-tenants.xml | 26 +
.../network/cisco/list-unassigned-asa1000v.xml | 39 +
.../cisco-vnmc/scripts/network/cisco/login.xml | 20 +
...AssociateAsaWithLogicalEdgeFirewallCommand.java | 53 +
.../api/CleanupLogicalEdgeFirewallCommand.java | 43 +
.../agent/api/ConfigureNexusVsmForAsaCommand.java | 95 +
.../api/CreateLogicalEdgeFirewallCommand.java | 94 +
.../api/commands/AddCiscoAsa1000vResourceCmd.java | 116 +
.../api/commands/AddCiscoVnmcResourceCmd.java | 115 +
.../commands/DeleteCiscoAsa1000vResourceCmd.java | 93 +
.../api/commands/DeleteCiscoVnmcResourceCmd.java | 93 +
.../commands/ListCiscoAsa1000vResourcesCmd.java | 110 +
.../api/commands/ListCiscoVnmcResourcesCmd.java | 106 +
.../response/CiscoAsa1000vResourceResponse.java | 88 +
.../api/response/CiscoVnmcResourceResponse.java | 75 +
.../cloud/network/cisco/CiscoAsa1000vDevice.java | 39 +
.../cloud/network/cisco/CiscoAsa1000vDeviceVO.java | 101 +
.../cloud/network/cisco/CiscoVnmcConnection.java | 196 +
.../network/cisco/CiscoVnmcConnectionImpl.java | 1415 +++++
.../cloud/network/cisco/CiscoVnmcController.java | 40 +
.../cloud/network/cisco/CiscoVnmcControllerVO.java | 102 +
.../cloud/network/cisco/NetworkAsa1000vMap.java | 31 +
.../cloud/network/cisco/NetworkAsa1000vMapVO.java | 73 +
.../com/cloud/network/dao/CiscoAsa1000vDao.java | 33 +
.../cloud/network/dao/CiscoAsa1000vDaoImpl.java | 63 +
.../src/com/cloud/network/dao/CiscoVnmcDao.java | 32 +
.../com/cloud/network/dao/CiscoVnmcDaoImpl.java | 51 +
.../cloud/network/dao/NetworkAsa1000vMapDao.java | 28 +
.../network/dao/NetworkAsa1000vMapDaoImpl.java | 61 +
.../network/element/CiscoAsa1000vService.java | 43 +
.../cloud/network/element/CiscoVnmcElement.java | 928 +++
.../network/element/CiscoVnmcElementService.java | 42 +
.../cloud/network/resource/CiscoVnmcResource.java | 780 +++
.../contrib/ssl/EasySSLProtocolSocketFactory.java | 232 +
.../contrib/ssl/EasyX509TrustManager.java | 114 +
.../network/cisco/CiscoVnmcConnectionTest.java | 248 +
.../network/element/CiscoVnmcElementTest.java | 401 ++
.../network/resource/CiscoVnmcResourceTest.java | 285 +
.../dns-notifier/resources/components-example.xml | 2 +-
.../element/F5ExternalLoadBalancerElement.java | 15 +-
.../element/JuniperSRXExternalFirewallElement.java | 58 +-
.../cloud/network/element/NetscalerElement.java | 3 +-
plugins/pom.xml | 2 +
.../CloudStackPrimaryDataStoreProviderImpl.java | 6 +-
server/pom.xml | 2 -
server/src/com/cloud/api/ApiDBUtils.java | 28 +-
server/src/com/cloud/api/ApiResponseHelper.java | 75 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 177 +-
.../com/cloud/api/query/ViewResponseHelper.java | 20 +-
.../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 +
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 142 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 27 +
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 248 +
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 37 +
server/src/com/cloud/configuration/Config.java | 3 +
.../cloud/configuration/ConfigurationManager.java | 8 +-
.../configuration/ConfigurationManagerImpl.java | 216 +-
.../AgentBasedConsoleProxyManager.java | 8 +-
.../AgentBasedConsoleProxyManager.java.orig | 298 -
.../src/com/cloud/consoleproxy/AgentHookBase.java | 50 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 21 +-
.../cloud/deploy/DeploymentPlanningManager.java | 45 +
.../deploy/DeploymentPlanningManagerImpl.java | 106 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 56 +-
server/src/com/cloud/domain/dao/DomainDaoImpl.java | 11 +-
.../cloud/network/ExteralIpAddressAllocator.java | 165 -
.../cloud/network/ExternalIpAddressAllocator.java | 165 +
server/src/com/cloud/network/IpAddrAllocator.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 317 +-
server/src/com/cloud/network/NetworkModelImpl.java | 26 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 109 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 16 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 12 +-
.../com/cloud/resource/ResourceManagerImpl.java | 22 +-
.../com/cloud/server/ConfigurationServerImpl.java | 25 +-
server/src/com/cloud/server/ManagementServer.java | 3 +
.../src/com/cloud/server/ManagementServerImpl.java | 199 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 81 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 99 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 16 +-
.../storage/snapshot/SnapshotManagerImpl.java | 11 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 44 +-
server/src/com/cloud/user/AccountManagerImpl.java | 15 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 73 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 132 +-
.../affinity/AffinityGroupServiceImpl.java | 346 ++
.../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 +
.../cloudstack/affinity/AffinityGroupVO.java | 114 +
.../cloudstack/affinity/dao/AffinityGroupDao.java | 30 +
.../affinity/dao/AffinityGroupDaoImpl.java | 102 +
.../affinity/dao/AffinityGroupVMMapDao.java | 47 +
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 167 +
.../configuration/ConfigurationManagerTest.java | 413 ++
.../com/cloud/network/MockNetworkManagerImpl.java | 38 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 16 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 25 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 54 +-
.../affinity/AffinityApiTestConfiguration.java | 344 ++
.../cloudstack/affinity/AffinityApiUnitTest.java | 187 +
.../networkoffering/ChildTestConfiguration.java | 7 +-
.../networkoffering/CreateNetworkOfferingTest.java | 1 -
server/test/resources/affinityContext.xml | 47 +
server/test/resources/network-mgr-component.xml | 2 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 253 +-
setup/db/db/schema-410to420.sql | 277 +-
test/integration/component/test_asa1000v_fw.py | 134 +
test/integration/smoke/test_ScaleVm.py | 4 +-
test/integration/smoke/test_affinity_groups.py | 194 +
test/integration/smoke/test_iso.py | 3 +-
test/integration/smoke/test_network.py | 4 +-
test/integration/smoke/test_public_ip_range.py | 173 +
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_templates.py | 3 +-
test/integration/smoke/test_vm_life_cycle.py | 2 +-
test/integration/smoke/test_volumes.py | 55 +-
tools/apidoc/gen_toc.py | 4 +-
tools/build/build_asf.sh | 12 +-
tools/build/build_docs.sh | 19 +-
tools/cli/cloudmonkey/requester.py | 4 +-
tools/marvin/marvin/integration/lib/base.py | 122 +-
ui/css/cloudstack3.css | 6 +-
ui/index.jsp | 2 +-
ui/scripts/cloudStack.js | 4 +-
ui/scripts/dashboard.js | 2 +-
ui/scripts/instances.js | 29 +-
ui/scripts/network.js | 10 +-
ui/scripts/regions.js | 169 +-
ui/scripts/sharedFunctions.js | 28 +-
ui/scripts/system.js | 5 +-
ui/scripts/ui-custom/regions.js | 2 +-
ui/scripts/ui/widgets/listView.js | 6 +-
usage/pom.xml | 5 +
usage/src/com/cloud/usage/UsageServer.java | 16 +-
utils/src/com/cloud/utils/SerialVersionUID.java | 1 +
.../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 22 +
.../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 213 +
.../cloud/utils/component/ComponentContext.java | 4 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 45 +-
281 files changed, 21503 insertions(+), 2184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7489889/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7489889/ui/index.jsp
----------------------------------------------------------------------
[19/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'ui-new-project-switcher' into ui-mixed-zone-management
Conflicts:
ui/scripts/ui-custom/projectSelect.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5891f09d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5891f09d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5891f09d
Branch: refs/heads/master
Commit: 5891f09d8c1420e8d27db44e62c0dab89eeb0d55
Parents: 5d05e49 d529eba
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 11:47:19 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 11:47:19 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/projectSelect.js | 38 ++++++++++++++++++++++++++-
ui/scripts/ui-custom/projects.js | 6 +++-
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[11/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - storage menu - volume section - Add volume action, Upload volume action - populate zone dropdown upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba7e49f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba7e49f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba7e49f1
Branch: refs/heads/master
Commit: ba7e49f11cd1c482ced8f814a518539ee153b040
Parents: 6544879
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 15:14:42 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 15:14:42 2013 -0700
----------------------------------------------------------------------
ui/scripts/storage.js | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba7e49f1/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 54605e2..9f7baf0 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -88,9 +88,22 @@
url: createURL("listZones&available=true"),
dataType: "json",
async: true,
- success: function(json) {
- var items = json.listzonesresponse.zone;
- args.response.success({descriptionField: 'name', data: items});
+ success: function(json) {
+ var zoneObjs;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ zoneObjs = json.listzonesresponse.zone;
+ }
+ else { //Basic type or Advanced type
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType)
+ zoneObjs.push(items[i]);
+ }
+ }
+ }
+ args.response.success({descriptionField: 'name', data: zoneObjs});
}
});
}
@@ -208,16 +221,29 @@
availabilityZone: {
label: 'label.availability.zone',
docID: 'helpUploadVolumeZone',
- select: function(args) {
- $.ajax({
+ select: function(args) {
+ $.ajax({
url: createURL("listZones&available=true"),
dataType: "json",
async: true,
- success: function(json) {
- var items = json.listzonesresponse.zone;
- args.response.success({descriptionField: 'name', data: items});
+ success: function(json) {
+ var zoneObjs;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ zoneObjs = json.listzonesresponse.zone;
+ }
+ else { //Basic type or Advanced type
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType)
+ zoneObjs.push(items[i]);
+ }
+ }
+ }
+ args.response.success({descriptionField: 'name', data: zoneObjs});
}
- });
+ });
}
},
format: {
[13/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - register ISO action - populate zone dropdown upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e392d25
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e392d25
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e392d25
Branch: refs/heads/master
Commit: 9e392d25ba38b04f62a7f61b39ffb26676c5fd09
Parents: 2431c81
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 16:05:01 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 16:05:01 2013 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e392d25/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index f579c50..b924841 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -877,16 +877,32 @@
url: createURL("listZones&available=true"),
dataType: "json",
async: true,
- success: function(json) {
- var zoneObjs = json.listzonesresponse.zone;
- var items = [];
- if (isAdmin() && !(cloudStack.context.projects &&
- cloudStack.context.projects[0]))
- items.push({id: -1, description: "All Zones"});
- $(zoneObjs).each(function() {
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
+ success: function(json) {
+ var zoneObjs;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ else { //Basic type or Advanced type
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType) {
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){
+ zoneObjs.unshift({id: -1, description: "All Zones"});
+ }
+ args.response.success({data: zoneObjs});
}
});
}
[08/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - instance wizard.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d146f3d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d146f3d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d146f3d9
Branch: refs/heads/master
Commit: d146f3d93aef1ea0b95ad3f6b81647fe926f5d53
Parents: fa8b835
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 13:55:51 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 13:55:51 2013 -0700
----------------------------------------------------------------------
ui/scripts/instanceWizard.js | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d146f3d9/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index e1aeafd..13828c8 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -70,14 +70,19 @@
steps: [
// Step 1: Setup
- function(args) {
- if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart
- //populate only one zone to the dropdown, the zone which the VPC is under.
- zoneObjs = [{
- id: args.context.vpc[0].zoneid,
- name: args.context.vpc[0].zonename,
- networktype: 'Advanced'
- }];
+ function(args) {
+ if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart (VPC is only available in Advanced zone)
+ if(args.context.zoneType == 'Basic'){ //Basic type
+ zoneObjs = [];
+ }
+ else { //Advanced type or all types
+ //populate only one zone to the dropdown, the zone which the VPC is under. (networktype should be 'Advanced' since VPC is only available in Advanced zone)
+ zoneObjs = [{
+ id: args.context.vpc[0].zoneid,
+ name: args.context.vpc[0].zonename,
+ networktype: 'Advanced'
+ }];
+ }
args.response.success({ data: {zones: zoneObjs}});
}
else { //from Instance page
@@ -85,8 +90,20 @@
url: createURL("listZones&available=true"),
dataType: "json",
async: false,
- success: function(json) {
- zoneObjs = json.listzonesresponse.zone;
+ success: function(json) {
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ zoneObjs = json.listzonesresponse.zone;
+ }
+ else { //Basic type or Advanced type
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType)
+ zoneObjs.push(items[i]);
+ }
+ }
+ }
args.response.success({ data: {zones: zoneObjs}});
}
});
[05/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Project switcher: Add label
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50140735
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50140735
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50140735
Branch: refs/heads/master
Commit: 50140735c7cc584b052105df1d16f861bc080475
Parents: f51ccfc
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 14:42:22 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 14:42:22 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 9 ++++++++-
ui/scripts/ui-custom/projectSelect.js | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50140735/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bf3cfb5..61e5ab4 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8913,6 +8913,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
padding: 9px 17px 0 0;
}
+.project-switcher label {
+ position: absolute;
+ top: -2px;
+ color: #FFFFFF;
+ font-size: 11px;
+}
+
.project-switcher select {
width: 100%;
font-size: 12px;
@@ -11390,7 +11397,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
border-bottom: 1px solid #FFFFFF;
height: 28px;
float: left;
- margin: 4px 13px 0 0;
+ margin: 5px 13px 0 0;
cursor: pointer;
/*+box-shadow:inset 0px 1px 1px #000000;*/
-moz-box-shadow: inset 0px 1px 1px #000000;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50140735/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index ae3d8f9..f93fefc 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -23,8 +23,9 @@
$('<option>').attr('value', 'basic').html(_l('Project 1')),
$('<option>').attr('value', 'advanced').html(_l('Project 2'))
);
+ var $label = $('<label>').html('Project:');
- $projectSelect.appendTo($projectSwitcher);
+ $projectSwitcher.append($label, $projectSelect);
$projectSwitcher.insertBefore($header.find('.region-switcher'));
});
}(jQuery, cloudStack));
[12/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - register template action - populate zone dropdown upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2431c814
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2431c814
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2431c814
Branch: refs/heads/master
Commit: 2431c814a8b070f55e36f9a94d08066cb81ea870
Parents: ba7e49f
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 15:57:37 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 15:57:37 2013 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2431c814/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 6268f6b..f579c50 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -115,16 +115,32 @@
url: createURL("listZones&available=true"),
dataType: "json",
async: true,
- success: function(json) {
- var zoneObjs = json.listzonesresponse.zone;
- var items = [];
- if (isAdmin() && !(cloudStack.context.projects &&
- cloudStack.context.projects[0]))
- items.push({id: -1, description: "All Zones"});
- $(zoneObjs).each(function() {
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
+ success: function(json) {
+ var zoneObjs;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ else { //Basic type or Advanced type
+ zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType) {
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){
+ zoneObjs.unshift({id: -1, description: "All Zones"});
+ }
+ args.response.success({data: zoneObjs});
}
});
}
[21/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0443030
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0443030
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0443030
Branch: refs/heads/master
Commit: e04430302dff167d70d741a93b3219bc9f6aec3e
Parents: c3009e3 977162b
Author: Brian Federle <br...@citrix.com>
Authored: Thu Apr 18 15:18:43 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Apr 18 15:18:43 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/IpAddress.java | 9 -
api/src/com/cloud/network/PublicIpAddress.java | 3 -
api/src/com/cloud/user/Account.java | 4 +
api/src/com/cloud/user/User.java | 2 +
.../cloudstack/affinity/AffinityGroupResponse.java | 5 +-
.../api/command/user/vm/DeployVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 2 +-
.../cloudstack/api/response/AccountResponse.java | 7 +
.../cloudstack/api/response/UserResponse.java | 8 +
core/src/com/cloud/user/AccountVO.java | 7 +
core/src/com/cloud/user/UserVO.java | 11 +-
docs/en-US/Release_Notes.xml | 389 ++++++++++-----
packaging/debian/init/cloud-management | 2 +-
packaging/debian/replace.properties | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 3 +-
pom.xml | 16 +
server/src/com/cloud/api/ApiResponseHelper.java | 9 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 11 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 8 +-
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 1 +
.../api/query/dao/UserAccountJoinDaoImpl.java | 1 +
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 10 +
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 11 +
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 16 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 6 +-
server/src/com/cloud/network/addr/PublicIp.java | 18 +-
server/src/com/cloud/network/dao/IPAddressVO.java | 2 -
.../network/element/VirtualRouterElement.java | 2 +-
.../com/cloud/server/ConfigurationServerImpl.java | 12 +-
server/src/com/cloud/user/AccountManagerImpl.java | 15 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +
.../affinity/AffinityGroupServiceImpl.java | 2 +-
.../cloudstack/affinity/AffinityGroupVO.java | 2 +-
setup/db/db/schema-410to420.sql | 337 ++++++++------
test/integration/smoke/test_public_ip_range.py | 2 +-
tools/build/build_asf.sh | 2 +-
tools/marvin/marvin/cloudstackConnection.py | 92 +++--
ui/css/cloudstack3.css | 11 +
ui/index.jsp | 5 +-
ui/modules/modules.js | 20 +
ui/scripts/plugins.js | 95 +++--
ui/scripts/ui-custom/pluginListing.js | 109 ++++
ui/scripts/ui-custom/plugins.js | 109 ----
ui/scripts/zoneWizard.js | 2 +-
44 files changed, 851 insertions(+), 539 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0443030/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0443030/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index 41ad491,5e5a7f2..9e1743e
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -1678,13 -1678,12 +1678,14 @@@ under the License
<script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
- <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
- <!-- Plugins -->
- <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
+ <!-- Plugin/module API -->
+ <script type="text/javascript" src="scripts/ui-custom/pluginListing.js?t=<%=now%>"></script>
<script type="text/javascript" src="plugins/plugins.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="modules/modules.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/plugins.js?t=<%=now%>"></script>
</body>
</html>
[09/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - network menu - show different sections upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f85ab8a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f85ab8a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f85ab8a2
Branch: refs/heads/master
Commit: f85ab8a26b48a022b1f025ce35a9b9a12c7dac04
Parents: d146f3d
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 14:34:14 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 14:34:14 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f85ab8a2/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 6c31192..dfb9f10 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -281,29 +281,7 @@
id: 'network',
sectionSelect: {
preFilter: function(args) {
- var havingSecurityGroupNetwork = false;
- var havingBasicZones = false;
- var havingAdvancedZones = true;
-
- // Get zone types
- $.ajax({
- url: createURL('listZones'),
- async: false,
- success: function(json) {
- var zones = json.listzonesresponse.zone ?
- json.listzonesresponse.zone : [];
- var basicZones = $.grep(zones, function(zone) {
- return zone.networktype == 'Basic';
- });
- var advancedZones = $.grep(zones, function(zone) {
- return zone.networktype == 'Advanced';
- });
-
-
- havingBasicZones = basicZones.length ? true : false;
- havingAdvancedZones = advancedZones.length ? true : false;
- }
- });
+ var havingSecurityGroupNetwork = false;
$.ajax({
url: createURL('listNetworks', { ignoreProject: true }),
@@ -322,11 +300,10 @@
var sectionsToShow = ['networks'];
- if (havingAdvancedZones) {
+ if(args.context.zoneType != 'Basic') { //Advanced type or all types
sectionsToShow.push('vpc');
sectionsToShow.push('vpnCustomerGateway');
}
-
if(havingSecurityGroupNetwork == true)
sectionsToShow.push('securityGroups');
[10/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - network menu - guest network section - show/hide Add Guest Network action upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65448791
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65448791
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65448791
Branch: refs/heads/master
Commit: 65448791ed55be8e4291223f37ed81256ffc0e1e
Parents: f85ab8a
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 14:56:36 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 14:56:36 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65448791/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index dfb9f10..a9a1a6b 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -320,21 +320,14 @@
title: 'label.guest.networks',
listView: {
actions: {
- add: {
+ add: { //add Isolated guest network (can't add Shared guest network here)
label: 'label.add.guest.network',
- preFilter: function(args) {
- var advSgDisabledZones;
- $.ajax({
- url: createURL('listZones'),
- async: false,
- success: function(json) {
- advSgDisabledZones = $.grep(json.listzonesresponse.zone, function(zone) {
- return (zone.networktype == 'Advanced' && zone.securitygroupsenabled != true); //Isolated networks can only be created in Advanced SG-disabled zone (but not in Basic zone nor Advanced SG-enabled zone)
- });
- }
- });
- return (advSgDisabledZones != null && advSgDisabledZones.length > 0);
+ preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone
+ if(args.context.zoneType != 'Basic')
+ return true;
+ else
+ return false;
},
createForm: {
[17/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Project selector UI functionality
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d529eba9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d529eba9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d529eba9
Branch: refs/heads/master
Commit: d529eba941f626d458d1e08bad860e97797d90fa
Parents: a748988
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 11:44:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 11:44:00 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/projectSelect.js | 38 ++++++++++++++++++++++++++-
ui/scripts/ui-custom/projects.js | 6 +++-
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d529eba9/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
index f93fefc..82d02c1 100644
--- a/ui/scripts/ui-custom/projectSelect.js
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -20,13 +20,47 @@
var $header = $('#header .controls');
var $projectSwitcher = $('<div>').addClass('project-switcher');
var $projectSelect = $('<select>').append(
- $('<option>').attr('value', 'basic').html(_l('Project 1')),
- $('<option>').attr('value', 'advanced').html(_l('Project 2'))
+ $('<option>').attr('value', '-1').html(_l('Default view'))
);
var $label = $('<label>').html('Project:');
+ // Get project list
+ cloudStack.projects.dataProvider({
+ context: cloudStack.context,
+ response: {
+ success: function(args) {
+ var projects = args.data;
+
+ $(projects).map(function(index, project) {
+ var $option = $('<option>').val(project.id);
+
+ $option.html(project.displaytext ? project.displaytext : project.name);
+ $option.appendTo($projectSelect);
+ });
+ },
+ error: function() {}
+ }
+ });
+
$projectSwitcher.append($label, $projectSelect);
$projectSwitcher.insertBefore($header.find('.region-switcher'));
+
+ // Change project event
+ $projectSelect.change(function() {
+ var projectID = $projectSelect.val();
+
+ if (projectID != -1) {
+ cloudStack.context.projects = [{
+ id: projectID
+ }];
+
+ cloudStack.uiCustom.projects({ alreadySelected: true });
+ } else {
+ cloudStack.context.projects = null;
+ $('#cloudStack3-container').removeClass('project-view');
+ $('#navigation li.dashboard').click();
+ }
+ });
});
}(jQuery, cloudStack));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d529eba9/ui/scripts/ui-custom/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projects.js b/ui/scripts/ui-custom/projects.js
index 117c433..82abadd 100644
--- a/ui/scripts/ui-custom/projects.js
+++ b/ui/scripts/ui-custom/projects.js
@@ -728,7 +728,11 @@
};
$dashboardNavItem.bind('click', event);
- pageElems.selector(args);
+ if (args.alreadySelected) {
+ showDashboard();
+ } else {
+ pageElems.selector(args);
+ }
};
/**
[03/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3fef24d3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3fef24d3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3fef24d3
Branch: refs/heads/master
Commit: 3fef24d3e86b18ef03ca67179f03d00661e1e7cc
Parents: 4b853cc f66b9b5
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 13:36:13 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 13:36:13 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 6 +
.../cloud/entity/api/VMEntityManagerImpl.java | 2 +-
.../debian/config/etc/init.d/cloud-early-config | 54 ++--
.../element/JuniperSRXExternalFirewallElement.java | 2 +-
.../cloud/network/resource/JuniperSrxResource.java | 322 +++++++++++----
scripts/network/juniper/application-add.xml | 2 +-
scripts/network/juniper/security-policy-add.xml | 4 +-
scripts/vm/hypervisor/kvm/patchviasocket.pl | 2 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 39 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 12 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 60 +++
.../definitions/systemvmtemplate/postinstall.sh | 27 +-
.../definitions/systemvmtemplate/preseed.cfg | 8 +-
.../definitions/systemvmtemplate64/postinstall.sh | 27 +-
.../definitions/systemvmtemplate64/preseed.cfg | 8 +-
15 files changed, 416 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
[06/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Zone type switcher: Style, add functionality
- Add top label to zone switcher, add more styling
- Implement zone switching functionality, which on change sets
cloudStack.context.zoneType to the relevant filter option, or null
for 'All' zone types
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa8b8358
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa8b8358
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa8b8358
Branch: refs/heads/master
Commit: fa8b83581bd39230f98806ed43f4103bb5454469
Parents: 5014073
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 14:43:42 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 14:43:42 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 30 ++++++++++++++++++++++++++++++
ui/index.jsp | 2 +-
ui/scripts/ui-custom/zoneFilter.js | 16 ++++++++++++----
3 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa8b8358/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 61e5ab4..3211130 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2277,6 +2277,34 @@ div.detail-group.actions td {
top: 13px;
}
+/** Zone filter (mixed zone management)*/
+#header .zone-filter {
+ float: left;
+ width: 111px;
+ margin: 9px 20px 0 2px;
+}
+
+#header .zone-filter label {
+ position: absolute;
+ top: -3px;
+ color: #FFFFFF;
+ font-size: 11px;
+}
+
+#header .zone-filter select {
+ width: 100%;
+ font-size: 12px;
+ border: 1px solid #000000;
+ border-bottom: #FFFFFF;
+ /*+border-radius:4px;*/
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ border-radius: 4px;
+ background: #ECECEC;
+ margin-top: 2px;
+}
+
/*Navigation*/
#navigation,
#browser {
@@ -8930,6 +8958,8 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
+ background: #ECECEC;
+ margin-top: 2px;
}
/*** Select project*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa8b8358/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 5b3ef3a..6b7d431 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1659,7 +1659,6 @@ under the License.
<script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
- <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>
@@ -1681,6 +1680,7 @@ under the License.
<script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
<!-- Plugins -->
<script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa8b8358/ui/scripts/ui-custom/zoneFilter.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneFilter.js b/ui/scripts/ui-custom/zoneFilter.js
index d298e4f..9e6a493 100644
--- a/ui/scripts/ui-custom/zoneFilter.js
+++ b/ui/scripts/ui-custom/zoneFilter.js
@@ -20,12 +20,20 @@
var $header = $('#header .controls');
var $zoneFilter = $('<div>').addClass('zone-filter');
var $zoneTypeSelect = $('<select>').append(
- $('<option>').attr('value', 'basic').html(_l('Basic')),
- $('<option>').attr('value', 'advanced').html(_l('Advanced'))
+ $('<option>').attr('value', '').html(_l('All zones')),
+ $('<option>').attr('value', 'Basic').html(_l('Basic')),
+ $('<option>').attr('value', 'Advanced').html(_l('Advanced'))
);
+ var $label = $('<label>').html('Zone type:');
- $zoneTypeSelect.appendTo($zoneFilter);
- $zoneFilter.insertAfter($header.find('#user'));
+ $zoneFilter.append($label, $zoneTypeSelect);
+ $zoneFilter.insertAfter($header.find('.project-switcher'));
+ $zoneTypeSelect.change(function() {
+ cloudStack.context.zoneType = $zoneTypeSelect.val();
+
+ // Go to default/start page (dashboard)
+ $('#breadcrumbs .home').click();
+ });
});
}(jQuery, cloudStack));
[02/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Layout new project selector (only dummy data for now)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa5ed0a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa5ed0a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa5ed0a0
Branch: refs/heads/master
Commit: aa5ed0a0fb3878bb6cf04d0770cd456dafcd9f4b
Parents: f66b9b5
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 13:34:25 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 13:34:25 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 27 ++++++++++++++++++++---
ui/index.jsp | 3 +-
ui/scripts/ui-custom/projectSelect.js | 31 ++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa5ed0a0/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7ebda9b..bf3cfb5 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8839,6 +8839,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
left: 0px;
top: -10px;
margin-right: 9px;
+ display: none;
}
#header div.view-switcher.alt {
@@ -8905,6 +8906,25 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
padding: 3px 0 4px;
}
+/*** View switcher (drop-down)*/
+.project-switcher {
+ float: left;
+ width: 141px;
+ padding: 9px 17px 0 0;
+}
+
+.project-switcher select {
+ width: 100%;
+ font-size: 12px;
+ border: 1px solid #000000;
+ border-bottom: #FFFFFF;
+ /*+border-radius:4px;*/
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ border-radius: 4px;
+}
+
/*** Select project*/
.project-selector {
display: inline-block;
@@ -11761,12 +11781,11 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
.updateResourceLimits:hover .icon {
background-position: -100px -614px;
}
-
+
.addVlanRange .icon {
background-position: -168px -31px;
}
-
.addVlanRange:hover .icon {
background-position: -168px -613px;
}
@@ -11796,8 +11815,8 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
background-position: -168px -31px;
}
-.reset .icon ,
-.scaleUp .icon{
+.reset .icon,
+.scaleUp .icon {
background-position: -168px -31px;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa5ed0a0/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 3b8f378..fcc3d69 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1678,7 +1678,8 @@ under the License.
<script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
<script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
- <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
+ <script type="text/javascript" src="scripts/ui-custom/projectSelect.js?t=<%=now%>"></script>
<!-- Plugins -->
<script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa5ed0a0/ui/scripts/ui-custom/projectSelect.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projectSelect.js b/ui/scripts/ui-custom/projectSelect.js
new file mode 100644
index 0000000..ae3d8f9
--- /dev/null
+++ b/ui/scripts/ui-custom/projectSelect.js
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+ $(window).bind('cloudStack.ready', function() {
+ var $header = $('#header .controls');
+ var $projectSwitcher = $('<div>').addClass('project-switcher');
+ var $projectSelect = $('<select>').append(
+ $('<option>').attr('value', 'basic').html(_l('Project 1')),
+ $('<option>').attr('value', 'advanced').html(_l('Project 2'))
+ );
+
+ $projectSelect.appendTo($projectSwitcher);
+ $projectSwitcher.insertBefore($header.find('.region-switcher'));
+ });
+}(jQuery, cloudStack));
+
[23/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'ui-mixed-zone-management'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc08c237
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc08c237
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc08c237
Branch: refs/heads/master
Commit: fc08c2372ca80c6a1f8e4ecfcc2e2a77e64589a9
Parents: 4a3a9df 355b910
Author: Brian Federle <br...@citrix.com>
Authored: Fri Apr 19 10:25:39 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Apr 19 10:25:39 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 59 ++++++++++++-
ui/index.jsp | 4 +-
ui/scripts/instanceWizard.js | 37 ++++++--
ui/scripts/network.js | 46 ++--------
ui/scripts/storage.js | 44 +++++++--
ui/scripts/templates.js | 134 ++++++++++++++++++++-------
ui/scripts/ui-custom/projectSelect.js | 66 ++++++++++++++
ui/scripts/ui-custom/projects.js | 6 +-
ui/scripts/ui-custom/zoneFilter.js | 39 ++++++++
9 files changed, 340 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
[18/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d05e49f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d05e49f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d05e49f
Branch: refs/heads/master
Commit: 5d05e49fa650c58301ee1b492e160e07f85e4294
Parents: dd62b3d 90e8158
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 16 11:45:05 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 16 11:45:05 2013 -0700
----------------------------------------------------------------------
DISCLAIMER | 7 -
.../agent/api/DeleteSnapshotBackupCommand.java | 6 +-
api/src/com/cloud/async/AsyncJob.java | 3 +-
.../cloud/configuration/ConfigurationService.java | 6 +
api/src/com/cloud/event/EventTypes.java | 12 +-
.../cloud/exception/AffinityConflictException.java | 34 +
api/src/com/cloud/network/Network.java | 15 +-
api/src/com/cloud/network/NetworkService.java | 2 +-
api/src/com/cloud/offering/NetworkOffering.java | 2 +
api/src/com/cloud/server/ManagementService.java | 4 +-
api/src/com/cloud/vm/DiskProfile.java | 2 +-
api/src/com/cloud/vm/UserVmService.java | 183 +-
.../apache/cloudstack/affinity/AffinityGroup.java | 31 +
.../affinity/AffinityGroupProcessor.java | 49 +
.../cloudstack/affinity/AffinityGroupResponse.java | 155 +
.../cloudstack/affinity/AffinityGroupService.java | 79 +
.../affinity/AffinityGroupTypeResponse.java | 48 +
.../cloudstack/affinity/AffinityProcessorBase.java | 44 +
.../org/apache/cloudstack/api/ApiConstants.java | 6 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 8 +-
.../apache/cloudstack/api/ResponseGenerator.java | 18 +-
.../command/admin/cluster/UpdateClusterCmd.java | 15 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 +
.../admin/offering/CreateServiceOfferingCmd.java | 7 +
.../admin/vlan/DedicatePublicIpRangeCmd.java | 108 +
.../admin/vlan/ReleasePublicIpRangeCmd.java | 77 +
.../command/user/address/AssociateIPAddrCmd.java | 31 +-
.../user/affinitygroup/CreateAffinityGroupCmd.java | 167 +
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 +
.../affinitygroup/ListAffinityGroupTypesCmd.java | 67 +
.../user/affinitygroup/ListAffinityGroupsCmd.java | 90 +
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 164 +
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 +
.../api/command/user/vm/DeployVMCmd.java | 41 +-
.../api/response/DeploymentPlannersResponse.java | 37 +
.../api/response/GlobalLoadBalancerResponse.java | 8 +
.../cloudstack/api/response/UserVmResponse.java | 14 +
.../network/ExternalNetworkDeviceManager.java | 1 +
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../com/cloud/bridge/service/EC2RestServlet.java | 2 +-
build/replace.properties | 1 +
client/pom.xml | 17 +-
client/tomcatconf/applicationContext.xml.in | 23 +-
client/tomcatconf/commands.properties.in | 20 +
client/tomcatconf/componentContext.xml.in | 20 +-
client/tomcatconf/nonossComponentContext.xml.in | 28 +
client/tomcatconf/simulatorComponentContext.xml.in | 30 +-
core/src/com/cloud/vm/VmDetailConstants.java | 1 +
debian/cloudstack-awsapi.install | 10 +-
debian/rules | 20 +-
docs/en-US/Admin_Guide.xml | 2 +-
docs/en-US/Book_Info.xml | 2 +-
docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +-
docs/en-US/Developers_Guide.xml | 2 +-
docs/en-US/Installation_Guide.xml | 2 +-
docs/en-US/Release_Notes.xml | 4413 ++++++++++++++-
docs/en-US/hypervisor-kvm-install-flow.xml | 1 +
docs/en-US/images/VMSnapshotButton.png | Bin 0 -> 967 bytes
docs/en-US/images/revert-vm.png | Bin 0 -> 860 bytes
docs/en-US/ipv6-support.xml | 4 +-
docs/en-US/virtual-machines.xml | 1 +
docs/en-US/vm-snapshots.xml | 146 +
.../subsystem/api/storage/CommandResult.java | 2 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 2 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 82 +-
.../platform/orchestration/CloudOrchestrator.java | 63 +-
.../driver/AncientImageDataStoreDriverImpl.java | 10 +-
.../image/motion/DefaultImageMotionStrategy.java | 4 +-
.../cloudstack/storage/test/DirectAgentTest.java | 4 +-
.../test/MockHypervisorHostEndPointRpcServer.java | 72 +
.../test/MockHypervsiorHostEndPointRpcServer.java | 72 -
.../integration-test/test/resource/component.xml | 2 +-
.../storage/snapshot/SnapshotObject.java | 2 +-
.../storage/HypervisorHostEndPointRpcServer.java | 119 +
.../storage/HypervsiorHostEndPointRpcServer.java | 119 -
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 2 +-
.../command/CreateVolumeFromBaseImageCommand.java | 6 +-
.../storage/datastore/DataObjectManagerImpl.java | 6 +-
.../provider/DataStoreProviderManagerImpl.java | 4 +-
.../storage/to/ImageOnPrimaryDataStoreTO.java | 44 +
.../storage/to/ImageOnPrimayDataStoreTO.java | 44 -
.../driver/DefaultPrimaryDataStoreDriverImpl.java | 4 +-
.../DefaultPrimaryDatastoreProviderImpl.java | 6 +-
.../volume/TemplateInstallStrategyImpl.java | 6 +-
packaging/centos63/cloud-usage.rc | 2 +-
packaging/centos63/cloud.spec | 14 +-
packaging/centos63/replace.properties | 2 +-
.../host-anti-affinity/pom.xml | 33 +
.../affinity/HostAntiAffinityProcessor.java | 93 +
.../cloudstack/syslog/AlertsSyslogAppender.java | 4 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 37 +-
.../vmware/manager/VmwareManagerImpl.java | 3 +-
.../hypervisor/vmware/resource/VmwareResource.java | 31 +-
.../xen/resource/XenServerStorageResource.java | 4 +-
plugins/network-elements/cisco-vnmc/pom.xml | 42 +
.../scripts/network/cisco/assoc-asa1000v.xml | 34 +
.../network/cisco/associate-acl-policy-set.xml | 37 +
.../network/cisco/associate-dhcp-policy.xml | 34 +
.../network/cisco/associate-dhcp-server.xml | 32 +
.../network/cisco/associate-nat-policy-set.xml | 35 +
.../network/cisco/associate-route-policy.xml | 33 +
.../network/cisco/create-acl-policy-ref.xml | 38 +
.../network/cisco/create-acl-policy-set.xml | 36 +
.../scripts/network/cisco/create-acl-policy.xml | 35 +
.../network/cisco/create-acl-rule-for-dnat.xml | 82 +
.../network/cisco/create-acl-rule-for-pf.xml | 156 +
.../scripts/network/cisco/create-dhcp-policy.xml | 72 +
.../scripts/network/cisco/create-dnat-rule.xml | 91 +
.../network/cisco/create-edge-device-profile.xml | 32 +
.../cisco/create-edge-device-route-policy.xml | 30 +
.../network/cisco/create-edge-device-route.xml | 35 +
.../scripts/network/cisco/create-edge-firewall.xml | 89 +
.../network/cisco/create-edge-security-profile.xml | 41 +
.../network/cisco/create-egress-acl-rule.xml | 201 +
.../cisco/create-generic-egress-acl-rule.xml | 122 +
.../cisco/create-generic-ingress-acl-rule.xml | 121 +
.../network/cisco/create-ingress-acl-rule.xml | 201 +
.../scripts/network/cisco/create-ip-pool.xml | 58 +
.../network/cisco/create-nat-policy-ref.xml | 38 +
.../network/cisco/create-nat-policy-set.xml | 37 +
.../scripts/network/cisco/create-nat-policy.xml | 33 +
.../scripts/network/cisco/create-pf-rule.xml | 166 +
.../scripts/network/cisco/create-port-pool.xml | 72 +
.../network/cisco/create-source-nat-pool.xml | 58 +
.../network/cisco/create-source-nat-rule.xml | 103 +
.../scripts/network/cisco/create-tenant.xml | 29 +
.../scripts/network/cisco/create-vdc.xml | 30 +
.../network/cisco/delete-acl-policy-set.xml | 30 +
.../scripts/network/cisco/delete-acl-policy.xml | 33 +
.../scripts/network/cisco/delete-edge-firewall.xml | 30 +
.../network/cisco/delete-edge-security-profile.xml | 38 +
.../network/cisco/delete-nat-policy-set.xml | 30 +
.../scripts/network/cisco/delete-nat-policy.xml | 33 +
.../scripts/network/cisco/delete-rule.xml | 31 +
.../scripts/network/cisco/delete-tenant.xml | 30 +
.../scripts/network/cisco/delete-vdc.xml | 30 +
.../scripts/network/cisco/disassoc-asa1000v.xml | 30 +
.../scripts/network/cisco/list-acl-policies.xml | 31 +
.../scripts/network/cisco/list-children.xml | 27 +
.../scripts/network/cisco/list-nat-policies.xml | 31 +
.../network/cisco/list-policyrefs-in-policyset.xml | 31 +
.../scripts/network/cisco/list-tenants.xml | 26 +
.../network/cisco/list-unassigned-asa1000v.xml | 39 +
.../cisco-vnmc/scripts/network/cisco/login.xml | 20 +
...AssociateAsaWithLogicalEdgeFirewallCommand.java | 53 +
.../api/CleanupLogicalEdgeFirewallCommand.java | 43 +
.../agent/api/ConfigureNexusVsmForAsaCommand.java | 95 +
.../api/CreateLogicalEdgeFirewallCommand.java | 94 +
.../api/commands/AddCiscoAsa1000vResourceCmd.java | 116 +
.../api/commands/AddCiscoVnmcResourceCmd.java | 115 +
.../commands/DeleteCiscoAsa1000vResourceCmd.java | 93 +
.../api/commands/DeleteCiscoVnmcResourceCmd.java | 93 +
.../commands/ListCiscoAsa1000vResourcesCmd.java | 110 +
.../api/commands/ListCiscoVnmcResourcesCmd.java | 106 +
.../response/CiscoAsa1000vResourceResponse.java | 88 +
.../api/response/CiscoVnmcResourceResponse.java | 75 +
.../cloud/network/cisco/CiscoAsa1000vDevice.java | 39 +
.../cloud/network/cisco/CiscoAsa1000vDeviceVO.java | 101 +
.../cloud/network/cisco/CiscoVnmcConnection.java | 196 +
.../network/cisco/CiscoVnmcConnectionImpl.java | 1415 +++++
.../cloud/network/cisco/CiscoVnmcController.java | 40 +
.../cloud/network/cisco/CiscoVnmcControllerVO.java | 102 +
.../cloud/network/cisco/NetworkAsa1000vMap.java | 31 +
.../cloud/network/cisco/NetworkAsa1000vMapVO.java | 73 +
.../com/cloud/network/dao/CiscoAsa1000vDao.java | 33 +
.../cloud/network/dao/CiscoAsa1000vDaoImpl.java | 63 +
.../src/com/cloud/network/dao/CiscoVnmcDao.java | 32 +
.../com/cloud/network/dao/CiscoVnmcDaoImpl.java | 51 +
.../cloud/network/dao/NetworkAsa1000vMapDao.java | 28 +
.../network/dao/NetworkAsa1000vMapDaoImpl.java | 61 +
.../network/element/CiscoAsa1000vService.java | 43 +
.../cloud/network/element/CiscoVnmcElement.java | 928 +++
.../network/element/CiscoVnmcElementService.java | 42 +
.../cloud/network/resource/CiscoVnmcResource.java | 780 +++
.../contrib/ssl/EasySSLProtocolSocketFactory.java | 232 +
.../contrib/ssl/EasyX509TrustManager.java | 114 +
.../network/cisco/CiscoVnmcConnectionTest.java | 248 +
.../network/element/CiscoVnmcElementTest.java | 401 ++
.../network/resource/CiscoVnmcResourceTest.java | 285 +
.../dns-notifier/resources/components-example.xml | 2 +-
.../element/F5ExternalLoadBalancerElement.java | 15 +-
.../element/JuniperSRXExternalFirewallElement.java | 58 +-
.../cloud/network/element/NetscalerElement.java | 3 +-
plugins/pom.xml | 2 +
.../CloudStackPrimaryDataStoreProviderImpl.java | 6 +-
server/pom.xml | 2 -
server/src/com/cloud/api/ApiDBUtils.java | 28 +-
server/src/com/cloud/api/ApiResponseHelper.java | 75 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 177 +-
.../com/cloud/api/query/ViewResponseHelper.java | 20 +-
.../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 +
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 142 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 27 +
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 248 +
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 37 +
server/src/com/cloud/configuration/Config.java | 3 +
.../cloud/configuration/ConfigurationManager.java | 8 +-
.../configuration/ConfigurationManagerImpl.java | 216 +-
.../AgentBasedConsoleProxyManager.java | 8 +-
.../AgentBasedConsoleProxyManager.java.orig | 298 -
.../src/com/cloud/consoleproxy/AgentHookBase.java | 50 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 21 +-
.../cloud/deploy/DeploymentPlanningManager.java | 45 +
.../deploy/DeploymentPlanningManagerImpl.java | 106 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 56 +-
server/src/com/cloud/domain/dao/DomainDaoImpl.java | 11 +-
.../cloud/network/ExteralIpAddressAllocator.java | 165 -
.../cloud/network/ExternalIpAddressAllocator.java | 165 +
server/src/com/cloud/network/IpAddrAllocator.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 317 +-
server/src/com/cloud/network/NetworkModelImpl.java | 26 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 109 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 16 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 12 +-
.../com/cloud/resource/ResourceManagerImpl.java | 22 +-
.../com/cloud/server/ConfigurationServerImpl.java | 25 +-
server/src/com/cloud/server/ManagementServer.java | 3 +
.../src/com/cloud/server/ManagementServerImpl.java | 199 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 81 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 99 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 16 +-
.../storage/snapshot/SnapshotManagerImpl.java | 11 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 44 +-
server/src/com/cloud/user/AccountManagerImpl.java | 15 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 73 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 132 +-
.../affinity/AffinityGroupServiceImpl.java | 346 ++
.../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 +
.../cloudstack/affinity/AffinityGroupVO.java | 114 +
.../cloudstack/affinity/dao/AffinityGroupDao.java | 30 +
.../affinity/dao/AffinityGroupDaoImpl.java | 102 +
.../affinity/dao/AffinityGroupVMMapDao.java | 47 +
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 167 +
.../configuration/ConfigurationManagerTest.java | 413 ++
.../com/cloud/network/MockNetworkManagerImpl.java | 38 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 16 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 25 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 54 +-
.../affinity/AffinityApiTestConfiguration.java | 344 ++
.../cloudstack/affinity/AffinityApiUnitTest.java | 187 +
.../networkoffering/ChildTestConfiguration.java | 7 +-
.../networkoffering/CreateNetworkOfferingTest.java | 1 -
server/test/resources/affinityContext.xml | 47 +
server/test/resources/network-mgr-component.xml | 2 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 253 +-
setup/db/db/schema-410to420.sql | 277 +-
test/integration/component/test_asa1000v_fw.py | 134 +
test/integration/smoke/test_ScaleVm.py | 4 +-
test/integration/smoke/test_affinity_groups.py | 194 +
test/integration/smoke/test_iso.py | 3 +-
test/integration/smoke/test_network.py | 4 +-
test/integration/smoke/test_public_ip_range.py | 173 +
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_templates.py | 3 +-
test/integration/smoke/test_vm_life_cycle.py | 2 +-
test/integration/smoke/test_volumes.py | 55 +-
tools/apidoc/gen_toc.py | 4 +-
tools/build/build_asf.sh | 12 +-
tools/build/build_docs.sh | 19 +-
tools/cli/cloudmonkey/requester.py | 4 +-
tools/marvin/marvin/integration/lib/base.py | 122 +-
ui/css/cloudstack3.css | 6 +-
ui/index.jsp | 2 +-
ui/scripts/cloudStack.js | 4 +-
ui/scripts/dashboard.js | 2 +-
ui/scripts/instances.js | 29 +-
ui/scripts/network.js | 10 +-
ui/scripts/regions.js | 169 +-
ui/scripts/sharedFunctions.js | 28 +-
ui/scripts/system.js | 5 +-
ui/scripts/ui-custom/regions.js | 2 +-
ui/scripts/ui/widgets/listView.js | 6 +-
usage/pom.xml | 5 +
usage/src/com/cloud/usage/UsageServer.java | 16 +-
utils/src/com/cloud/utils/SerialVersionUID.java | 1 +
.../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 22 +
.../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 213 +
.../cloud/utils/component/ComponentContext.java | 4 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 45 +-
281 files changed, 21503 insertions(+), 2184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d05e49f/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d05e49f/ui/index.jsp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d05e49f/ui/scripts/network.js
----------------------------------------------------------------------
[20/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3009e31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3009e31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3009e31
Branch: refs/heads/master
Commit: c3009e316b31609f8e8e29b11756593f264afa2b
Parents: 5891f09 5ee3cc4
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 17 11:09:01 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 17 11:09:01 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkService.java | 2 +-
api/src/com/cloud/network/PhysicalNetwork.java | 5 +-
api/src/com/cloud/server/ManagementService.java | 2 -
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 ---
.../admin/network/UpdatePhysicalNetworkCmd.java | 8 +-
.../admin/offering/CreateServiceOfferingCmd.java | 6 -
.../api/command/user/tag/CreateTagsCmd.java | 2 +-
.../api/command/user/tag/DeleteTagsCmd.java | 2 +-
.../api/command/user/tag/ListTagsCmd.java | 2 +-
client/tomcatconf/applicationContext.xml.in | 1 -
docs/en-US/Release_Notes.xml | 334 +++++++--------
docs/en-US/source-build.xml | 4 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 51 +++-
.../kvm/resource/LibvirtComputingResource.java | 22 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 3 +-
server/src/com/cloud/api/ApiResponseHelper.java | 3 +-
server/src/com/cloud/configuration/Config.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 19 +-
server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 6 +
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 50 +++-
.../network/ExternalFirewallDeviceManagerImpl.java | 14 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 289 +++++++++----
.../com/cloud/network/dao/PhysicalNetworkVO.java | 20 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 14 +-
.../src/com/cloud/server/ManagementServerImpl.java | 19 -
.../src/com/cloud/service/ServiceOfferingVO.java | 23 -
.../src/com/cloud/storage/StorageManagerImpl.java | 4 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 11 +
.../configuration/ConfigurationManagerTest.java | 4 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../cloud/network/UpdatePhysicalNetworkTest.java | 68 +++
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
setup/db/db/schema-410to420.sql | 1 -
test/integration/component/test_accounts.py | 10 +-
.../component/test_allocation_states.py | 2 +-
test/integration/component/test_blocker_bugs.py | 8 +-
test/integration/component/test_egress_rules.py | 13 +-
test/integration/component/test_eip_elb.py | 3 +-
.../integration/component/test_network_offering.py | 5 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 4 +-
.../component/test_project_resources.py | 7 +-
test/integration/component/test_project_usage.py | 10 +-
test/integration/component/test_projects.py | 8 +-
test/integration/component/test_resource_limits.py | 4 +-
test/integration/component/test_routers.py | 5 +-
test/integration/component/test_security_groups.py | 9 +-
test/integration/component/test_snapshots.py | 8 +-
test/integration/component/test_templates.py | 3 +-
test/integration/component/test_usage.py | 10 +-
.../integration/component/test_vm_passwdenabled.py | 1 +
test/integration/component/test_volumes.py | 6 +-
test/integration/smoke/test_non_contigiousvlan.py | 125 ++++++
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/asyncJobMgr.py | 2 +-
tools/marvin/marvin/cloudstackConnection.py | 238 ++++++-----
tools/marvin/marvin/cloudstackTestClient.py | 3 +-
tools/marvin/marvin/codegenerator.py | 4 +-
tools/marvin/marvin/deployDataCenter.py | 1 -
tools/marvin/marvin/jsonHelper.py | 7 +-
tools/marvin/setup.py | 1 +
ui/scripts/cloudStack.js | 6 +-
ui/scripts/regions.js | 308 ++++++++++++--
ui/scripts/system.js | 52 ++-
ui/scripts/zoneWizard.js | 16 +-
69 files changed, 1334 insertions(+), 630 deletions(-)
----------------------------------------------------------------------
[15/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - copy ISO action - populate zone dropdown upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd62b3de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd62b3de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd62b3de
Branch: refs/heads/master
Commit: dd62b3de7e57fd3eeb75502e7e57564b6560b6b0
Parents: 6c2f2d3
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 16:42:40 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 16:42:40 2013 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd62b3de/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index c1e01c1..52e1135 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1222,14 +1222,30 @@
url: createURL("listZones&available=true"),
dataType: "json",
async: true,
- success: function(json) {
- var zoneObjs = json.listzonesresponse.zone;
- var items = [];
- $(zoneObjs).each(function() {
- if(this.id != args.context.isos[0].zoneid)
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
+ success: function(json) {
+ var zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ else { //Basic type or Advanced type
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType) { //type must be matched
+ if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ }
+ args.response.success({data: zoneObjs});
}
});
}
[04/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'ui-new-project-switcher' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f51ccfcf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f51ccfcf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f51ccfcf
Branch: refs/heads/master
Commit: f51ccfcfb900a29a7c2f4c52620a493446e39925
Parents: 3fef24d aa5ed0a
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 13:36:20 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 10 13:36:20 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 27 ++++++++++++++++++++---
ui/index.jsp | 3 +-
ui/scripts/ui-custom/projectSelect.js | 31 ++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f51ccfcf/ui/index.jsp
----------------------------------------------------------------------
[22/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/355b9101
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/355b9101
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/355b9101
Branch: refs/heads/master
Commit: 355b910173799d52124ee46efd4cef489775e68c
Parents: e044303 4a3a9df
Author: Brian Federle <br...@citrix.com>
Authored: Fri Apr 19 10:23:15 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Apr 19 10:23:15 2013 -0700
----------------------------------------------------------------------
.../cloud/agent/api/MigrateWithStorageAnswer.java | 39 ++
.../cloud/agent/api/MigrateWithStorageCommand.java | 45 ++
.../api/MigrateWithStorageCompleteAnswer.java | 38 ++
.../api/MigrateWithStorageCompleteCommand.java | 36 ++
.../agent/api/MigrateWithStorageReceiveAnswer.java | 55 +++
.../api/MigrateWithStorageReceiveCommand.java | 45 ++
.../agent/api/MigrateWithStorageSendAnswer.java | 39 ++
.../agent/api/MigrateWithStorageSendCommand.java | 58 +++
.../agent/api/storage/MigrateVolumeAnswer.java | 38 ++
.../agent/api/storage/MigrateVolumeCommand.java | 51 ++
.../cloud/hypervisor/HypervisorCapabilities.java | 2 +
api/src/com/cloud/network/element/IpDeployer.java | 6 +-
api/src/com/cloud/server/ManagementService.java | 19 +-
api/src/com/cloud/vm/UserVmService.java | 27 ++
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../apache/cloudstack/api/ResponseGenerator.java | 6 +
.../api/command/admin/config/ListCfgsByCmd.java | 24 +-
.../api/command/admin/config/UpdateCfgCmd.java | 22 +-
.../admin/host/FindHostsForMigrationCmd.java | 107 +++++
.../api/command/admin/host/ListHostsCmd.java | 7 +-
.../storage/FindStoragePoolsForMigrationCmd.java | 98 ++++
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 160 +++++++
.../api/command/user/volume/MigrateVolumeCmd.java | 8 +
.../api/response/ConfigurationResponse.java | 12 +
.../api/response/HostForMigrationResponse.java | 365 +++++++++++++++
.../cloudstack/api/response/HostResponse.java | 1 -
.../response/StoragePoolForMigrationResponse.java | 248 ++++++++++
.../api/response/StoragePoolResponse.java | 3 -
.../api/command/test/ListCfgCmdTest.java | 89 ++++
.../api/command/test/UpdateCfgCmdTest.java | 116 +++++
client/tomcatconf/applicationContext.xml.in | 1 +
client/tomcatconf/commands.properties.in | 3 +
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 24 +-
docs/en-US/build-nonoss.xml | 49 ++
docs/en-US/source.xml | 1 +
.../troubleshooting-working-with-server-logs.xml | 6 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 2 +
.../subsystem/api/storage/VolumeService.java | 7 +-
.../datastore/db/StoragePoolDetailsDao.java | 1 +
.../image/motion/DefaultImageMotionStrategy.java | 18 +
.../storage/test/MockStorageMotionStrategy.java | 19 +
.../storage/motion/AncientDataMotionStrategy.java | 84 ++++-
.../storage/motion/DataMotionService.java | 9 +
.../storage/motion/DataMotionServiceImpl.java | 16 +
.../storage/motion/DataMotionStrategy.java | 10 +
.../cloudstack/storage/volume/VolumeObject.java | 2 +
.../storage/volume/VolumeServiceImpl.java | 174 +++++++-
.../debian/config/etc/init.d/cloud-early-config | 53 +--
.../manager/allocator/impl/RandomAllocator.java | 56 +++
.../xen/resource/CitrixResourceBase.java | 4 +-
.../xen/resource/XenServer56FP1Resource.java | 1 +
.../xen/resource/XenServer610Resource.java | 359 ++++++++++++++-
.../motion/XenServerStorageMotionStrategy.java | 239 ++++++++++
.../cloud/network/element/NiciraNvpElement.java | 5 +
.../network/element/NiciraNvpElementTest.java | 238 +++++++---
.../agent/manager/allocator/HostAllocator.java | 23 +-
.../manager/allocator/impl/FirstFitAllocator.java | 47 ++
.../manager/allocator/impl/TestingAllocator.java | 7 +
server/src/com/cloud/api/ApiDBUtils.java | 19 +
server/src/com/cloud/api/ApiResponseHelper.java | 27 +-
.../com/cloud/api/query/ViewResponseHelper.java | 37 ++
.../src/com/cloud/api/query/dao/HostJoinDao.java | 5 +
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 135 ++++++-
.../cloud/api/query/dao/StoragePoolJoinDao.java | 6 +
.../api/query/dao/StoragePoolJoinDaoImpl.java | 59 +++-
server/src/com/cloud/configuration/Config.java | 54 ++-
.../cloud/configuration/ConfigurationManager.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 51 ++-
.../cloud/configuration/dao/ConfigurationDao.java | 1 +
server/src/com/cloud/dc/dao/VlanDao.java | 2 +
server/src/com/cloud/dc/dao/VlanDaoImpl.java | 19 +
.../src/com/cloud/network/NetworkManagerImpl.java | 20 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 6 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 5 +-
.../src/com/cloud/server/ConfigurationServer.java | 5 +
.../com/cloud/server/ConfigurationServerImpl.java | 93 ++++-
.../src/com/cloud/server/ManagementServerImpl.java | 308 +++++++++++--
server/src/com/cloud/storage/VolumeManager.java | 8 +
.../src/com/cloud/storage/VolumeManagerImpl.java | 112 +++++-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 9 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 123 +++++
server/src/com/cloud/vm/VirtualMachineManager.java | 4 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 233 +++++++++-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 8 +
.../cloud/vm/MockVirtualMachineManagerImpl.java | 10 +
.../cloud/vm/VirtualMachineManagerImplTest.java | 231 +++++++++-
.../cloud/vpc/MockConfigurationManagerImpl.java | 5 +-
setup/db/db/schema-410to420.sql | 2 +
test/integration/component/test_storage_motion.py | 298 ++++++++++++
test/integration/smoke/test_UpdateCfg.py | 85 ++++
.../definitions/systemvmtemplate/cleanup.sh | 1 -
.../definitions/systemvmtemplate64/cleanup.sh | 1 -
tools/marvin/marvin/integration/lib/base.py | 22 +
ui/css/cloudstack3.css | 11 +
ui/scripts/instances.js | 66 ++-
ui/scripts/storage.js | 73 +++-
96 files changed, 5111 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b9101/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b9101/ui/scripts/storage.js
----------------------------------------------------------------------
[14/23] git commit: updated refs/heads/master to fc08c23
Posted by bf...@apache.org.
CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - copy template action - populate zone dropdown upon selected zone type on top menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c2f2d3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c2f2d3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c2f2d3a
Branch: refs/heads/master
Commit: 6c2f2d3a9de1d255854afcce8bd2fc3519696498
Parents: 9e392d2
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Apr 15 16:35:07 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Apr 15 16:35:07 2013 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c2f2d3a/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index b924841..c1e01c1 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -547,13 +547,29 @@
dataType: "json",
async: true,
success: function(json) {
- var zoneObjs = json.listzonesresponse.zone;
- var items = [];
- $(zoneObjs).each(function() {
- if(this.id != args.context.templates[0].zoneid)
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
+ var zoneObjs = [];
+ var items = json.listzonesresponse.zone;
+ if(args.context.zoneType == null || args.context.zoneType == '') { //all types
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ else { //Basic type or Advanced type
+ if(items != null) {
+ for(var i = 0; i < items.length; i++) {
+ if(items[i].networktype == args.context.zoneType) { //type must be matched
+ if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone
+ zoneObjs.push({id: items[i].id, description: items[i].name});
+ }
+ }
+ }
+ }
+ }
+ args.response.success({data: zoneObjs});
}
});
}