cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [50/50] [abbrv] git commit: refs/heads/ui-multiple-nics - Merge branch 'master' into ui-multiple-nics
Date Tue, 05 Mar 2013 18:37:39 GMT
Updated Branches:
  refs/heads/ui-multiple-nics e653c0251 -> fb8f33d2c


Merge branch 'master' into ui-multiple-nics


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

Branch: refs/heads/ui-multiple-nics
Commit: fb8f33d2c73027179abcea5bd2a1e12c10931d84
Parents: e653c02 9c5c475
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Mar 5 10:37:17 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Mar 5 10:37:17 2013 -0800

----------------------------------------------------------------------
 agent/conf/agent.properties                        |    2 +-
 agent/pom.xml                                      |    2 -
 agent/src/com/cloud/agent/AgentShell.java          |    4 +-
 .../cloud/exception/PermissionDeniedException.java |    4 +
 .../com/cloud/exception/RequestLimitException.java |    3 +-
 api/src/com/cloud/network/IpAddress.java           |    3 +
 api/src/com/cloud/network/NetworkService.java      |   15 +-
 api/src/com/cloud/network/rules/RulesService.java  |    5 +-
 api/src/com/cloud/vm/Nic.java                      |    1 +
 api/src/com/cloud/vm/NicSecondaryIp.java           |   36 +
 api/src/org/apache/cloudstack/acl/APIChecker.java  |    3 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    5 +
 .../apache/cloudstack/api/ResponseGenerator.java   |    7 +
 .../command/user/config/ListCapabilitiesCmd.java   |    8 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |   19 +-
 .../api/command/user/nat/EnableStaticNatCmd.java   |   12 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |  176 ++
 .../api/command/user/vm/ListNicsCmd.java           |  133 ++
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |  123 ++
 .../api/response/AddIpToVmNicResponse.java         |   85 +
 .../cloudstack/api/response/IPAddressResponse.java |    8 +
 .../cloudstack/api/response/NicResponse.java       |   12 +-
 .../api/response/NicSecondaryIpResponse.java       |   85 +
 .../api/command/test/AddIpToVmNicTest.java         |  132 ++
 .../bridge/persist/dao/CloudStackUserDaoImpl.java  |    2 +
 client/pom.xml                                     |   26 +-
 client/tomcatconf/commands.properties.in           |    5 +
 client/tomcatconf/componentContext.xml.in          |   19 +-
 client/tomcatconf/components.xml.in                |    1 +
 client/tomcatconf/nonossComponentContext.xml.in    |   15 +-
 debian/cloudstack-agent.install                    |   10 +-
 debian/cloudstack-agent.postinst                   |   40 +
 debian/cloudstack-common.install                   |    2 -
 debian/cloudstack-management.install               |   10 +-
 debian/cloudstack-management.postinst              |    6 +-
 debian/cloudstack-usage.install                    |    4 +-
 debian/control                                     |    2 +-
 debian/rules                                       |  112 +-
 deps/install-non-oss.sh                            |   11 +-
 docs/en-US/accessing-vms.xml                       |    4 +-
 docs/en-US/add-clusters-ovm.xml                    |    6 +-
 docs/en-US/added-error-codes.xml                   |    2 +-
 docs/en-US/aws-ec2-configuration.xml               |    5 +-
 docs/en-US/aws-ec2-user-setup.xml                  |    4 +-
 docs/en-US/building-marvin.xml                     |    4 +-
 ...change-console-proxy-ssl-certificate-domain.xml |    4 +-
 docs/en-US/citrix-xenserver-installation.xml       |    8 +-
 docs/en-US/console-proxy.xml                       |    4 +-
 docs/en-US/create-bare-metal-template.xml          |    1 -
 docs/en-US/creating-vms.xml                        |    2 +-
 docs/en-US/dedicated-ha-hosts.xml                  |    2 +-
 docs/en-US/deployment-architecture-overview.xml    |    3 +-
 docs/en-US/shared-networks.xml                     |    3 +-
 docs/en-US/upload-existing-volume-to-vm.xml        |    6 +-
 docs/en-US/using-vpn-with-mac.xml                  |   15 +-
 docs/en-US/using-vpn-with-windows.xml              |   10 +-
 docs/en-US/zone-add.xml                            |    2 +-
 .../StorageAllocatorTestConfiguration.java         |    8 +-
 packaging/centos63/cloud-agent.rc                  |   97 +-
 packaging/centos63/cloud.spec                      |    8 +-
 packaging/debian/init/cloud-agent                  |    9 +-
 packaging/debian/init/cloud-usage                  |    2 +-
 packaging/debian/replace.properties                |   26 +-
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    9 +
 .../api/command/user/ratelimit/GetApiLimitCmd.java |   11 +
 .../cloudstack/ratelimit/ApiRateLimitService.java  |    2 +
 .../ratelimit/ApiRateLimitServiceImpl.java         |   21 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |   25 +
 .../BaremetalKickStartPxeResource.java             |    2 +-
 .../BaremetalKickStartServiceImpl.java             |   33 +-
 .../PrepareKickstartPxeServerCommand.java          |   31 +-
 plugins/hypervisors/kvm/pom.xml                    |    7 +-
 .../kvm/resource/LibvirtComputingResource.java     |  116 ++-
 .../kvm/resource/LibvirtVifDriverTest.java         |  226 +++
 .../src/com/cloud/ucs/database/UcsBladeDao.java    |    5 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java    |   10 +-
 .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java |   27 +-
 .../src/com/cloud/ucs/database/UcsManagerDao.java  |    5 +-
 .../com/cloud/ucs/database/UcsManagerDaoImpl.java  |   10 +-
 .../src/com/cloud/ucs/database/UcsManagerVO.java   |   12 +-
 .../com/cloud/ucs/manager/AddUcsManagerCmd.java    |   18 +-
 .../cloud/ucs/manager/AddUcsManagerResponse.java   |   69 -
 .../ucs/manager/AssociateUcsProfileToBladeCmd.java |   18 +-
 ...sociateUcsProfileToBladesInClusterResponse.java |   22 -
 .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java |   87 +
 .../com/cloud/ucs/manager/ListUcsManagerCmd.java   |   20 +-
 .../cloud/ucs/manager/ListUcsManagerResponse.java  |   58 -
 .../com/cloud/ucs/manager/ListUcsProfileCmd.java   |   16 +-
 .../cloud/ucs/manager/ListUcsProfileResponse.java  |   36 -
 .../src/com/cloud/ucs/manager/StringTemplate.java  |    5 +-
 .../com/cloud/ucs/manager/UcsBladeResponse.java    |   84 +
 .../ucs/src/com/cloud/ucs/manager/UcsCommands.java |    7 +-
 .../src/com/cloud/ucs/manager/UcsHttpClient.java   |   12 +-
 .../ucs/src/com/cloud/ucs/manager/UcsManager.java  |   18 +-
 .../src/com/cloud/ucs/manager/UcsManagerImpl.java  |  146 ++-
 .../com/cloud/ucs/manager/UcsManagerResponse.java  |   73 +
 .../com/cloud/ucs/manager/UcsProfileResponse.java  |   37 +
 .../src/com/cloud/ucs/structure/ComputeBlade.java  |    7 +-
 .../src/com/cloud/ucs/structure/UcsProfile.java    |    9 +-
 plugins/hypervisors/vmware/pom.xml                 |   12 -
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |  114 +-
 .../vmware/manager/VmwareManagerImpl.java          |   93 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |  358 ++--
 .../vmware/resource/VmwareContextFactory.java      |   12 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  258 ++--
 .../VmwareSecondaryStorageContextFactory.java      |   31 +-
 .../VmwareSecondaryStorageResourceHandler.java     |   18 +-
 pom.xml                                            |    8 +-
 .../ping/prepare_kickstart_kernel_initrd.py        |   55 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |   33 +-
 server/pom.xml                                     |   28 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   10 +
 server/src/com/cloud/api/ApiResponseHelper.java    |   56 +
 server/src/com/cloud/api/ApiServer.java            |   20 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    9 +-
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |   33 +-
 server/src/com/cloud/configuration/Config.java     |    3 +-
 server/src/com/cloud/network/NetworkManager.java   |   12 +
 .../src/com/cloud/network/NetworkManagerImpl.java  |   76 +-
 server/src/com/cloud/network/NetworkModelImpl.java |    5 +
 .../src/com/cloud/network/NetworkServiceImpl.java  |  170 ++
 server/src/com/cloud/network/addr/PublicIp.java    |   34 +-
 server/src/com/cloud/network/dao/IPAddressDao.java |    7 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   17 +-
 server/src/com/cloud/network/dao/IPAddressVO.java  |   16 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    3 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   29 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |  113 +-
 .../network/rules/dao/PortForwardingRulesDao.java  |    2 +
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    8 +
 .../src/com/cloud/server/ManagementServerImpl.java |   10 +-
 .../cloud/template/HyervisorTemplateAdapter.java   |  340 ----
 .../cloud/template/HypervisorTemplateAdapter.java  |  339 ++++
 server/src/com/cloud/vm/NicVO.java                 |   11 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    8 +
 server/src/com/cloud/vm/dao/NicDao.java            |    2 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |   12 +-
 server/src/com/cloud/vm/dao/NicSecondaryIpDao.java |   53 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |  138 ++
 server/src/com/cloud/vm/dao/NicSecondaryIpVO.java  |  160 ++
 .../dao/RandomlyIncreasingVMInstanceDaoImpl.java   |   36 -
 .../com/cloud/network/MockNetworkManagerImpl.java  |   47 +
 .../com/cloud/network/MockRulesManagerImpl.java    |   19 +-
 server/test/com/cloud/upgrade/DbUpgrade22Test.java |    2 +
 .../UserVmCloneSettingDaoTestConfiguration.java    |    2 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   73 +
 setup/db/db/schema-40to410.sql                     |   76 +-
 setup/db/db/schema-410to420.sql                    |   28 +
 tools/apidoc/gen_toc.py                            |    3 +
 tools/appliance/build.sh                           |   20 +-
 .../definitions/systemvmtemplate/postinstall.sh    |    3 +-
 tools/marvin/marvin/codegenerator.py               |   49 +-
 ui/css/cloudstack3.css                             |   24 +-
 ui/images/bg-what-is-cloudstack.png                |  Bin 36083 -> 36116 bytes
 ui/scripts/docs.js                                 |   19 +
 ui/scripts/globalSettings.js                       |    2 +-
 ui/scripts/regions.js                              |    2 +-
 ui/scripts/system.js                               |  106 +-
 ui/scripts/ui-custom/regions.js                    |    9 +-
 ui/scripts/ui/widgets/detailView.js                |    8 +-
 ui/scripts/zoneWizard.js                           |   16 +-
 utils/src/com/cloud/utils/db/Transaction.java      |    4 +-
 utils/src/com/cloud/utils/xmlobject/XmlObject.java |    5 +-
 vmware-base/pom.xml                                |   12 -
 .../src/com/cloud/hypervisor/vmware/mo/BaseMO.java |   74 +-
 .../com/cloud/hypervisor/vmware/mo/ClusterMO.java  |  318 ++--
 .../vmware/mo/CustomFieldsManagerMO.java           |   32 +-
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |  328 ++--
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java    |  186 ++-
 .../vmware/mo/DistributedVirtualSwitchMO.java      |   12 +-
 .../vmware/mo/HostDatastoreBrowserMO.java          |   58 +-
 .../vmware/mo/HostDatastoreSystemMO.java           |   92 +-
 .../hypervisor/vmware/mo/HostFirewallSystemMO.java |   14 +-
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |  486 +++---
 .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java |  109 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  282 ++--
 .../com/cloud/hypervisor/vmware/mo/NetworkMO.java  |   15 +-
 .../cloud/hypervisor/vmware/mo/PerfManagerMO.java  |   85 +-
 .../src/com/cloud/hypervisor/vmware/mo/TaskMO.java |   24 +-
 .../hypervisor/vmware/mo/VirtualDiskManagerMO.java |  126 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     | 1276 ++++++++-------
 .../hypervisor/vmware/mo/VirtualSwitchType.java    |    8 +-
 .../cloud/hypervisor/vmware/util/VmwareClient.java |  558 +++++++
 .../hypervisor/vmware/util/VmwareContext.java      |  370 +++--
 .../vmware/util/VmwareGuestOsMapper.java           |  282 ++--
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |  269 ++--
 .../vmware/mo/TestVmwareContextFactory.java        |   14 +-
 .../cloud/hypervisor/vmware/mo/TestVmwareMO.java   |    1 -
 vmware-base/test/com/cloud/vmware/TestVMWare.java  |    7 +-
 189 files changed, 7186 insertions(+), 3798 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fb8f33d2/ui/css/cloudstack3.css
----------------------------------------------------------------------

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


Mime
View raw message