cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [96/96] [abbrv] git commit: updated refs/heads/ui-vpc-redesign to 9be3660
Date Mon, 13 May 2013 18:02:27 GMT
Merge branch 'master' into ui-vpc-redesign


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

Branch: refs/heads/ui-vpc-redesign
Commit: 9be36609fd0334277d9b7afd1100d0d73322ecc7
Parents: df0919b 2224ecb
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon May 13 11:00:16 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon May 13 11:00:16 2013 -0700

----------------------------------------------------------------------
 agent/pom.xml                                      |    5 +
 agent/src/com/cloud/agent/AgentShell.java          |  108 +--
 api/src/com/cloud/agent/api/to/DnsmasqTO.java      |   53 ++
 api/src/com/cloud/agent/api/to/NetworkACLTO.java   |   49 +-
 api/src/com/cloud/event/EventTypes.java            |   19 +
 .../exception/MissingParameterValueException.java  |   25 +
 api/src/com/cloud/network/Network.java             |    5 +
 api/src/com/cloud/network/NetworkProfile.java      |   19 +
 api/src/com/cloud/network/NetworkService.java      |    9 +-
 .../cloud/network/element/DhcpServiceProvider.java |    2 +
 .../network/element/NetworkACLServiceProvider.java |    3 +-
 api/src/com/cloud/network/element/VpcProvider.java |    2 +
 .../cloud/network/firewall/NetworkACLService.java  |   51 --
 api/src/com/cloud/network/vpc/NetworkACL.java      |   36 +
 api/src/com/cloud/network/vpc/NetworkACLItem.java  |   80 ++
 .../com/cloud/network/vpc/NetworkACLService.java   |  135 ++++
 api/src/com/cloud/network/vpc/VpcGateway.java      |    5 +
 api/src/com/cloud/network/vpc/VpcService.java      |    3 +-
 .../com/cloud/server/ResourceMetaDataService.java  |   47 ++
 api/src/com/cloud/server/ResourceTag.java          |    1 +
 .../com/cloud/server/TaggedResourceService.java    |    5 +-
 api/src/com/cloud/storage/VolumeApiService.java    |    9 +-
 api/src/com/cloud/vm/NicIpAlias.java               |   45 ++
 api/src/com/cloud/vm/UserVmService.java            |   22 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    7 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    4 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |   20 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |    9 +-
 .../command/admin/vpc/CreatePrivateGatewayCmd.java |   13 +-
 .../command/user/network/CreateNetworkACLCmd.java  |  222 ++----
 .../user/network/CreateNetworkACLListCmd.java      |  120 +++
 .../api/command/user/network/CreateNetworkCmd.java |   22 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |   43 +-
 .../user/network/DeleteNetworkACLListCmd.java      |   93 +++
 .../user/network/ListNetworkACLListsCmd.java       |  102 +++
 .../command/user/network/ListNetworkACLsCmd.java   |   46 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |  120 +++
 .../user/network/UpdateNetworkACLItemCmd.java      |  173 +++++
 .../api/command/user/network/UpdateNetworkCmd.java |    9 +-
 .../api/command/user/vm/DeployVMCmd.java           |   14 +-
 .../api/command/user/vm/UpdateVMCmd.java           |    7 +
 .../command/user/volume/AddResourceDetailCmd.java  |  116 +++
 .../api/command/user/volume/CreateVolumeCmd.java   |    8 +-
 .../user/volume/ListResourceDetailsCmd.java        |   75 ++
 .../user/volume/RemoveResourceDetailCmd.java       |  110 +++
 .../api/command/user/volume/UpdateVolumeCmd.java   |  112 +++
 .../api/response/DiskOfferingResponse.java         |   12 +
 .../api/response/NetworkACLItemResponse.java       |  122 +++
 .../api/response/NetworkACLResponse.java           |   78 +--
 .../cloudstack/api/response/NetworkResponse.java   |   13 +-
 .../cloudstack/api/response/NicDetailResponse.java |   81 ++
 .../api/response/PrivateGatewayResponse.java       |    9 +
 .../api/response/ResourceDetailResponse.java       |   81 ++
 .../cloudstack/api/response/UserVmResponse.java    |    9 +
 .../api/response/VolumeDetailResponse.java         |   82 ++
 .../cloudstack/api/response/VolumeResponse.java    |   12 +
 .../org/apache/cloudstack/query/QueryService.java  |   26 +-
 client/tomcatconf/applicationContext.xml.in        |    7 +
 client/tomcatconf/commands.properties.in           |   20 +
 .../agent/api/routing/CreateIpAliasCommand.java    |   36 +
 .../agent/api/routing/DeleteIpAliasCommand.java    |   50 ++
 .../agent/api/routing/DnsMasqConfigCommand.java    |   65 ++
 .../src/com/cloud/agent/api/routing/IpAliasTO.java |   42 +
 .../agent/api/routing/NetworkElementCommand.java   |    2 +
 .../agent/api/routing/SetNetworkACLCommand.java    |   19 +-
 .../virtualnetwork/VirtualRoutingResource.java     |  132 +++-
 .../src/com/cloud/network/DnsMasqConfigurator.java |  118 +++
 core/src/com/cloud/storage/VolumeDetailVO.java     |   85 ++
 debian/rules                                       |    2 +-
 docs/en-US/Installation_Guide.xml                  |    1 +
 docs/en-US/gslb.xml                                |   21 +
 docs/en-US/storage-setup.xml                       |  192 +++++
 engine/schema/src/com/cloud/dc/dao/VlanDao.java    |    6 +-
 .../schema/src/com/cloud/dc/dao/VlanDaoImpl.java   |   38 +-
 .../src/com/cloud/network/dao/IPAddressDao.java    |    8 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   39 +-
 .../src/com/cloud/network/dao/NetworkDao.java      |    2 +
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |    9 +
 .../src/com/cloud/network/dao/NetworkVO.java       |   25 +
 .../src/com/cloud/network/vpc/VpcGatewayVO.java    |   17 +-
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |    2 +
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   18 +
 .../src/com/cloud/storage/DiskOfferingVO.java      |   12 +
 engine/schema/src/com/cloud/storage/VolumeVO.java  |   14 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |  159 ++++
 engine/schema/src/com/cloud/vm/VMInstanceVO.java   |   11 +
 engine/schema/src/com/cloud/vm/dao/NicDao.java     |    6 +-
 engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java |   19 +-
 engine/schema/src/com/cloud/vm/dao/UserVmDao.java  |    3 +-
 .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java |    3 +-
 .../cloudstack/storage/volume/db/VolumeVO.java     |    2 +
 .../storage/volume/VolumeServiceImpl.java          |    5 +-
 packaging/centos63/cloud.spec                      |    3 +
 .../debian/config/opt/cloud/bin/vpc_acl.sh         |   11 +-
 .../config/opt/cloud/bin/vpc_privategw_acl.sh      |  224 ++++++
 .../systemvm/debian/config/root/createIpAlias.sh   |   35 +
 .../systemvm/debian/config/root/deleteIpAlias.sh   |   43 +
 patches/systemvm/debian/config/root/dnsmasq.sh     |   43 +
 .../networkservice/BaremetalDhcpElement.java       |   41 +-
 .../kvm/resource/LibvirtComputingResource.java     |    3 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  236 +++++-
 .../xen/resource/CitrixResourceBase.java           |  213 ++++--
 .../cloud/network/resource/CiscoVnmcResource.java  |    8 +-
 .../network/resource/CiscoVnmcResourceTest.java    |   13 +-
 .../com/cloud/network/element/MidoNetElement.java  |   59 +-
 pom.xml                                            |    1 +
 scripts/vm/hypervisor/xenserver/createipAlias.sh   |   26 +
 scripts/vm/hypervisor/xenserver/deleteipAlias.sh   |   25 +
 scripts/vm/hypervisor/xenserver/vmops              |   45 ++-
 scripts/vm/hypervisor/xenserver/xcpserver/patch    |    2 +
 scripts/vm/hypervisor/xenserver/xenserver56/patch  |    2 +
 .../vm/hypervisor/xenserver/xenserver56fp1/patch   |    2 +
 scripts/vm/hypervisor/xenserver/xenserver60/patch  |    2 +
 server/src/com/cloud/api/ApiDBUtils.java           |   31 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   79 ++-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |  111 +++-
 .../api/query/dao/DiskOfferingJoinDaoImpl.java     |    5 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    1 +
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |    1 +
 .../com/cloud/api/query/vo/DiskOfferingJoinVO.java |   11 +
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |   10 +
 .../src/com/cloud/api/query/vo/VolumeJoinVO.java   |   10 +
 .../cloud/configuration/ConfigurationManager.java  |    6 +-
 .../configuration/ConfigurationManagerImpl.java    |  358 +++++++--
 .../cloud/metadata/ResourceMetaDataManager.java    |   22 +
 .../metadata/ResourceMetaDataManagerImpl.java      |  247 ++++++
 server/src/com/cloud/network/NetworkManager.java   |   10 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   81 ++-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   58 ++-
 server/src/com/cloud/network/addr/PublicIp.java    |    4 +
 .../network/element/VirtualRouterElement.java      |   59 ++
 .../network/element/VpcVirtualRouterElement.java   |   58 ++-
 .../network/firewall/FirewallManagerImpl.java      |    4 +-
 .../router/VirtualNetworkApplianceManager.java     |   13 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |  273 ++++++-
 .../router/VpcVirtualNetworkApplianceManager.java  |    9 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   91 ++-
 .../com/cloud/network/vpc/NetworkACLItemDao.java   |   37 +
 .../com/cloud/network/vpc/NetworkACLItemVO.java    |  237 ++++++
 .../com/cloud/network/vpc/NetworkACLManager.java   |  133 +++-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |  596 +++++++--------
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |  491 ++++++++++++
 server/src/com/cloud/network/vpc/NetworkACLVO.java |   79 ++
 .../cloud/network/vpc/PrivateGatewayProfile.java   |    6 +
 server/src/com/cloud/network/vpc/VpcManager.java   |    9 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   32 +-
 .../com/cloud/network/vpc/dao/NetworkACLDao.java   |   23 +
 .../cloud/network/vpc/dao/NetworkACLDaoImpl.java   |   35 +
 .../network/vpc/dao/NetworkACLItemDaoImpl.java     |  113 +++
 .../src/com/cloud/server/ManagementServerImpl.java |   20 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |   49 +-
 .../com/cloud/storage/dao/VolumeDetailsDao.java    |   36 +
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java    |  114 +++
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |   25 +-
 server/src/com/cloud/vm/NicDetailVO.java           |   85 ++
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   69 ++-
 server/src/com/cloud/vm/dao/NicDetailDao.java      |   35 +
 server/src/com/cloud/vm/dao/NicDetailDaoImpl.java  |  110 +++
 server/src/com/cloud/vm/dao/NicIpAliasDao.java     |   61 ++
 server/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |  186 +++++
 server/src/com/cloud/vm/dao/NicIpAliasVO.java      |  226 ++++++
 .../cloud/configuration/ValidateIpRangeTest.java   |   71 ++
 .../metadata/ResourceMetaDataManagerTest.java      |  117 +++
 .../com/cloud/network/MockNetworkManagerImpl.java  |   31 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   10 +-
 server/test/com/cloud/vm/UserVmManagerTest.java    |    4 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   79 +--
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   50 +-
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |   21 +-
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |   20 +-
 .../test/com/cloud/vpc/NetworkACLManagerTest.java  |  201 +++++
 .../test/com/cloud/vpc/NetworkACLServiceTest.java  |  226 ++++++
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    5 +
 .../networkoffering/CreateNetworkOfferingTest.java |   29 +-
 .../cloudstack/privategw/AclOnPrivateGwTest.java   |  286 +++++++
 server/test/resources/createNetworkOffering.xml    |   21 +-
 setup/db/db/schema-302to40.sql                     |   10 +-
 setup/db/db/schema-410to420.sql                    |  429 +++++++++++-
 test/integration/smoke/test_network_acl.py         |  118 +++
 test/integration/smoke/test_nicdetail.py           |  224 ++++++
 test/integration/smoke/test_privategw_acl.py       |  148 ++++
 test/integration/smoke/test_resource_detail.py     |  188 +++++
 test/integration/smoke/test_volumedetail.py        |  239 ++++++
 .../definitions/systemvmtemplate/postinstall.sh    |    8 +-
 .../definitions/systemvmtemplate64/postinstall.sh  |    8 +-
 tools/marvin/setup.py                              |   14 +-
 ui/scripts/events.js                               |   10 +-
 ui/scripts/ui-custom/vpc.js                        |    1 +
 ui/scripts/vpc.js                                  |   46 +-
 usage/pom.xml                                      |    2 +-
 190 files changed, 10390 insertions(+), 1520 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9be36609/ui/scripts/vpc.js
----------------------------------------------------------------------


Mime
View raw message