cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [50/50] git commit: updated refs/heads/ui-restyle to 06ccb84
Date Fri, 15 Nov 2013 20:03:35 GMT
Merge branch 'master' into ui-restyle


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06ccb847
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06ccb847
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06ccb847

Branch: refs/heads/ui-restyle
Commit: 06ccb8473e477ae4f2c88b4ace01f6d5422ac22f
Parents: 9dd6ff6 0b8cc97
Author: Brian Federle <bfederle@gmail.com>
Authored: Fri Nov 15 12:00:52 2013 -0800
Committer: Brian Federle <bfederle@gmail.com>
Committed: Fri Nov 15 12:00:52 2013 -0800

----------------------------------------------------------------------
 .gitignore                                      |   4 +-
 .../com/cloud/agent/resource/DummyResource.java |   2 +-
 .../cloud/agent/api/HostVmStateReportEntry.java |  19 +-
 .../cloud/deploy/DeploymentClusterPlanner.java  |  10 +
 api/src/com/cloud/network/lb/SslCert.java       |  16 +
 api/src/com/cloud/server/ResourceTag.java       |   8 +-
 .../org/apache/cloudstack/api/ApiConstants.java |   1 +
 .../user/firewall/ListFirewallRulesCmd.java     |   9 +
 .../firewall/ListPortForwardingRulesCmd.java    |   9 +
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |  19 +-
 .../api/response/FirewallRuleResponse.java      |   7 +
 .../api/response/StoragePoolResponse.java       |  11 +
 client/tomcatconf/db.properties.in              |   1 +
 .../core/spring-core-registry-core-context.xml  |  10 +
 ...re-lifecycle-network-context-inheritable.xml |   6 +
 .../com/cloud/agent/api/PingRoutingCommand.java |  16 +-
 .../api/PingRoutingWithNwGroupsCommand.java     |   6 +-
 .../agent/api/PingRoutingWithOvsCommand.java    |   6 +-
 .../cloud/agent/api/StartupRoutingCommand.java  |  46 +-
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |  15 +-
 debian/cloudstack-management.install            |   1 -
 developer/pom.xml                               |   1 +
 .../api/storage/DataStoreCapabilities.java      |  23 +
 .../subsystem/api/storage/DataStoreDriver.java  |   3 +
 .../cloud/agent/manager/AgentManagerImpl.java   |   2 +-
 .../orchestration/VolumeOrchestrator.java       |  10 +
 .../spring-engine-schema-core-daos-context.xml  |   2 +
 .../src/com/cloud/network/dao/NetworkVO.java    |   2 +-
 .../com/cloud/network/dao/SslCertDaoImpl.java   |  16 +
 .../cloud/storage/dao/SnapshotDetailsDao.java   |  25 +
 .../storage/dao/SnapshotDetailsDaoImpl.java     |  28 +
 .../cloud/storage/dao/SnapshotDetailsVO.java    |  72 ++
 .../src/com/cloud/storage/dao/VolumeDao.java    |   2 +
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |  24 +
 .../resourcedetail/FirewallRuleDetailVO.java    |  78 +-
 .../resourcedetail/RemoteAccessVpnDetailVO.java |  80 ++
 .../resourcedetail/UserIpAddressDetailVO.java   |  80 ++
 .../dao/RemoteAccessVpnDetailsDao.java          |  26 +
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      |  35 +
 .../dao/UserIpAddressDetailsDao.java            |  26 +
 .../dao/UserIpAddressDetailsDaoImpl.java        |  35 +
 .../snapshot/XenserverSnapshotStrategy.java     |  13 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java   |  11 +-
 .../datastore/ObjectInDataStoreManagerImpl.java |   9 +-
 .../storage/helper/HypervisorHelperImpl.java    |   2 +-
 .../storage/helper/VMSnapshotHelperImpl.java    |   2 +-
 .../storage/image/BaseImageStoreDriverImpl.java |  14 +-
 .../framework/config/ConfigDepot.java           |   4 +
 .../framework/config/impl/ConfigDepotImpl.java  |  17 +-
 framework/db/pom.xml                            |   5 +
 .../src/com/cloud/utils/db/StaticStrategy.java  | 130 +++
 .../com/cloud/utils/db/TransactionLegacy.java   |   8 +-
 .../db/test/com/cloud/utils/DbUtilTest.java     |  81 ++
 packaging/centos63/cloud.spec                   |   4 +-
 .../networkservice/BareMetalResourceBase.java   |  33 +-
 .../BaremetalDhcpResourceBase.java              |   4 +-
 .../networkservice/BaremetalDhcpdResource.java  |   4 +-
 .../BaremetalDnsmasqResource.java               |   4 +-
 .../BaremetalKickStartPxeResource.java          |   4 +-
 .../BaremetalPingPxeResource.java               |   4 +-
 .../resource/HypervDirectConnectResource.java   |   8 +-
 .../test/HypervDirectConnectResourceTest.java   |   4 +-
 .../kvm/resource/LibvirtComputingResource.java  | 143 ++-
 .../resource/LibvirtComputingResourceTest.java  | 109 ++-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |  42 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |   3 +-
 .../cloud/resource/AgentRoutingResource.java    |  16 +-
 .../manager/VmwareStorageManagerImpl.java       |   3 +-
 .../vmware/resource/VmwareResource.java         | 257 +++--
 .../resource/VmwareStorageProcessor.java        |   4 +-
 .../xen/resource/CitrixResourceBase.java        |  80 +-
 .../driver/CloudStackImageStoreDriverImpl.java  |   8 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |  21 +-
 .../SamplePrimaryDataStoreDriverImpl.java       |   8 +
 .../driver/SolidfirePrimaryDataStoreDriver.java |  16 +-
 .../spring-server-core-managers-context.xml     |   4 +-
 server/src/com/cloud/api/ApiResponseHelper.java |  12 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  17 +
 .../com/cloud/capacity/CapacityManagerImpl.java |  24 +-
 server/src/com/cloud/configuration/Config.java  |   2 -
 .../configuration/ConfigurationManagerImpl.java |  22 +-
 .../src/com/cloud/deploy/FirstFitPlanner.java   |  22 +-
 .../kvm/discoverer/KvmDummyResourceBase.java    |   5 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |  12 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |  15 +-
 .../network/firewall/FirewallManagerImpl.java   |  27 +-
 .../VirtualNetworkApplianceManagerImpl.java     | 246 ++---
 .../VpcVirtualNetworkApplianceManagerImpl.java  |  10 +
 .../cloud/network/rules/RulesManagerImpl.java   |  12 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   4 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |  33 +-
 .../cloud/resource/DummyHostServerResource.java |   4 +-
 .../cloud/server/ConfigurationServerImpl.java   |   5 +-
 .../template/HypervisorTemplateAdapter.java     |   6 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |  43 +-
 .../cloudstack/network/lb/CertServiceTest.java  | 203 ++--
 .../networkoffering/ChildTestConfiguration.java |   6 +
 services/console-proxy-rdp/rdpconsole/pom.xml   |  29 +-
 .../src/main/java/streamer/SocketWrapper.java   |   2 +-
 .../src/test/java/rdpclient/MockServerTest.java |   2 +-
 services/pom.xml                                |   1 +
 setup/db/db/schema-420to421.sql                 |   3 +
 setup/db/db/schema-421to430.sql                 |  29 +
 setup/db/hypervisor_capabilities.simulator.sql  |  19 +
 .../config/opt/cloud/bin/monitor_service.sh     |   2 +-
 .../debian/config/root/monitorServices.py       |  39 +-
 test/integration/component/test_assign_vm.py    |   2 +-
 .../component/test_base_image_updation.py       |   4 +
 test/integration/component/test_blocker_bugs.py |   2 +-
 test/integration/component/test_egress_rules.py |  39 +-
 test/integration/component/test_netscaler_lb.py |  36 +-
 .../component/test_netscaler_lb_algo.py         |  10 +-
 .../component/test_network_offering.py          |   1 -
 test/integration/component/test_portable_ip.py  |  24 +-
 .../component/test_project_limits.py            |  10 +-
 .../component/test_resource_limits.py           |   2 +-
 .../component/test_security_groups.py           |  11 +-
 .../component/test_shared_networks.py           |  12 +-
 .../component/test_snapshot_limits.py           |   1 -
 test/integration/component/test_stopped_vm.py   |   5 +-
 .../component/test_storage_motion.py            |   1 -
 test/integration/component/test_templates.py    |   1 -
 test/integration/component/test_vmware_drs.py   | 713 ++++++++++++++
 test/integration/component/test_vpc_network.py  |   1 -
 test/integration/component/test_vpc_routers.py  |   1 -
 .../component/test_vpc_vm_life_cycle.py         | 954 ++++++++++++++++++-
 .../component/test_vpc_vms_deployment.py        |   1 -
 test/integration/smoke/test_network.py          |   6 +-
 .../systemvm64template/postinstall.sh           |   3 +-
 .../definitions/systemvmtemplate/postinstall.sh |   3 +-
 tools/marvin/marvin/asyncJobMgr.py              |   2 +-
 tools/marvin/marvin/cloudstackConnection.py     |  15 +-
 tools/marvin/marvin/cloudstackTestClient.py     |  16 +-
 tools/marvin/marvin/integration/lib/base.py     |  10 +-
 tools/marvin/marvin/integration/lib/utils.py    |   5 +-
 tools/marvin/marvin/sandbox/demo/__init__.py    |  17 +
 .../marvin/marvin/sandbox/demo/live/__init__.py |  17 +
 .../demo/simulator/testcase/libs/utils.py       |   5 +-
 tools/transifex/.tx/config                      |  16 +
 ui/scripts/regions.js                           |  50 +-
 ui/scripts/sharedFunctions.js                   |  20 +
 ui/scripts/storage.js                           |   2 +-
 ui/scripts/system.js                            | 454 +++++----
 ui/scripts/ui/widgets/detailView.js             |   9 +-
 ui/scripts/zoneWizard.js                        | 401 +++++---
 .../hypervisor/vmware/mo/HttpNfcLeaseMO.java    |   5 +
 .../vmware/mo/HypervisorHostHelper.java         |  23 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  | 214 ++++-
 148 files changed, 4745 insertions(+), 1106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06ccb847/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06ccb847/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------


Mime
View raw message