You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/21 12:18:50 UTC
[22/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Re-merge with
network-refactor
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Re-merge with network-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/56cd8096
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/56cd8096
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/56cd8096
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: 56cd809600613bb8bf6cbd8354b9256eba52a60d
Parents: d9e36ac 0b60c0d
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Thu Jan 17 11:32:49 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Thu Jan 17 11:32:49 2013 -0800
----------------------------------------------------------------------
.../api/commands/CreatePrivateNetworkCmd.java | 8 +-
.../cloud/api/commands/DestroyConsoleProxyCmd.java | 2 +-
.../org/apache/cloudstack/api/ApiErrorCode.java | 59 ++++
api/src/org/apache/cloudstack/api/BaseCmd.java | 25 +--
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 2 +-
.../apache/cloudstack/api/ServerApiException.java | 33 ++-
.../command/admin/account/CreateAccountCmd.java | 2 +-
.../command/admin/account/DeleteAccountCmd.java | 2 +-
.../command/admin/account/DisableAccountCmd.java | 2 +-
.../command/admin/account/EnableAccountCmd.java | 3 +-
.../api/command/admin/account/LockAccountCmd.java | 2 +-
.../command/admin/account/UpdateAccountCmd.java | 3 +-
.../command/admin/autoscale/CreateCounterCmd.java | 3 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 5 +-
.../api/command/admin/cluster/AddClusterCmd.java | 6 +-
.../command/admin/cluster/DeleteClusterCmd.java | 3 +-
.../command/admin/cluster/UpdateClusterCmd.java | 3 +-
.../api/command/admin/config/UpdateCfgCmd.java | 3 +-
.../config/UpdateHypervisorCapabilitiesCmd.java | 3 +-
.../api/command/admin/domain/CreateDomainCmd.java | 2 +-
.../api/command/admin/domain/DeleteDomainCmd.java | 2 +-
.../api/command/admin/domain/UpdateDomainCmd.java | 2 +-
.../api/command/admin/host/AddHostCmd.java | 5 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 4 +-
.../command/admin/host/CancelMaintenanceCmd.java | 3 +-
.../api/command/admin/host/DeleteHostCmd.java | 3 +-
.../admin/host/PrepareForMaintenanceCmd.java | 3 +-
.../api/command/admin/host/ReconnectHostCmd.java | 5 +-
.../api/command/admin/host/UpdateHostCmd.java | 3 +-
.../command/admin/network/AddNetworkDeviceCmd.java | 5 +-
.../network/AddNetworkServiceProviderCmd.java | 5 +-
.../admin/network/CreateNetworkOfferingCmd.java | 2 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 5 +-
.../network/CreateStorageNetworkIpRangeCmd.java | 3 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 7 +-
.../admin/network/DeleteNetworkOfferingCmd.java | 3 +-
.../network/DeleteNetworkServiceProviderCmd.java | 7 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 2 +-
.../network/DeleteStorageNetworkIpRangeCmd.java | 2 +-
.../admin/network/ListNetworkDeviceCmd.java | 5 +-
.../admin/network/ListPhysicalNetworksCmd.java | 3 +-
.../network/ListStorageNetworkIpRangeCmd.java | 2 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 2 +-
.../network/UpdateNetworkServiceProviderCmd.java | 3 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 2 +-
.../admin/offering/CreateDiskOfferingCmd.java | 3 +-
.../admin/offering/CreateServiceOfferingCmd.java | 3 +-
.../admin/offering/DeleteDiskOfferingCmd.java | 3 +-
.../admin/offering/DeleteServiceOfferingCmd.java | 2 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 3 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 2 +-
.../api/command/admin/pod/CreatePodCmd.java | 2 +-
.../api/command/admin/pod/DeletePodCmd.java | 3 +-
.../api/command/admin/pod/UpdatePodCmd.java | 2 +-
.../admin/resource/UploadCustomCertificateCmd.java | 2 +-
.../router/ConfigureVirtualRouterElementCmd.java | 3 +-
.../router/CreateVirtualRouterElementCmd.java | 4 +-
.../api/command/admin/router/DestroyRouterCmd.java | 3 +-
.../api/command/admin/router/RebootRouterCmd.java | 2 +-
.../api/command/admin/router/StartRouterCmd.java | 2 +-
.../api/command/admin/router/StopRouterCmd.java | 3 +-
.../api/command/admin/router/UpgradeRouterCmd.java | 2 +-
.../api/command/admin/storage/AddS3Cmd.java | 5 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 3 +-
.../admin/storage/CreateStoragePoolCmd.java | 8 +-
.../api/command/admin/storage/DeletePoolCmd.java | 4 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 3 +-
.../admin/storage/UpdateStoragePoolCmd.java | 2 +-
.../api/command/admin/swift/AddSwiftCmd.java | 4 +-
.../command/admin/systemvm/DestroySystemVmCmd.java | 2 +-
.../command/admin/systemvm/MigrateSystemVMCmd.java | 11 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 3 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 3 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 2 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 +-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 5 +-
.../command/admin/usage/DeleteTrafficTypeCmd.java | 3 +-
.../command/admin/usage/UpdateTrafficTypeCmd.java | 3 +-
.../api/command/admin/user/CreateUserCmd.java | 3 +-
.../api/command/admin/user/DeleteUserCmd.java | 3 +-
.../api/command/admin/user/DisableUserCmd.java | 3 +-
.../api/command/admin/user/EnableUserCmd.java | 2 +-
.../api/command/admin/user/LockUserCmd.java | 3 +-
.../api/command/admin/user/UpdateUserCmd.java | 2 +-
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 6 +-
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 3 +-
.../api/command/admin/vm/AssignVMCmd.java | 4 +-
.../api/command/admin/vm/MigrateVMCmd.java | 10 +-
.../api/command/admin/vm/RecoverVMCmd.java | 3 +-
.../command/admin/vpc/CreatePrivateGatewayCmd.java | 9 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 4 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 3 +-
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 3 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 2 +-
.../api/command/admin/zone/CreateZoneCmd.java | 3 +-
.../api/command/admin/zone/DeleteZoneCmd.java | 2 +-
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 3 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 2 +-
.../user/account/AddAccountToProjectCmd.java | 2 +-
.../user/account/DeleteAccountFromProjectCmd.java | 2 +-
.../command/user/address/AssociateIPAddrCmd.java | 9 +-
.../user/address/DisassociateIPAddrCmd.java | 2 +-
.../user/autoscale/CreateAutoScalePolicyCmd.java | 2 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 4 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 3 +-
.../command/user/autoscale/CreateConditionCmd.java | 3 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 3 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 3 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 3 +-
.../command/user/autoscale/DeleteConditionCmd.java | 5 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 3 +-
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 2 +-
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 3 +-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 2 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 2 +-
.../user/firewall/CreateFirewallRuleCmd.java | 7 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 4 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 2 +-
.../user/firewall/DeletePortForwardingRuleCmd.java | 2 +-
.../user/firewall/UpdatePortForwardingRuleCmd.java | 2 +-
.../api/command/user/iso/AttachIsoCmd.java | 5 +-
.../api/command/user/iso/DeleteIsoCmd.java | 3 +-
.../api/command/user/iso/DetachIsoCmd.java | 3 +-
.../api/command/user/iso/ExtractIsoCmd.java | 4 +-
.../api/command/user/iso/RegisterIsoCmd.java | 2 +-
.../api/command/user/iso/UpdateIsoCmd.java | 3 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 3 +-
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 5 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 7 +-
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 3 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 2 +-
.../RemoveFromLoadBalancerRuleCmd.java | 2 +-
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 2 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 5 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 3 +-
.../api/command/user/nat/DisableStaticNatCmd.java | 3 +-
.../api/command/user/nat/EnableStaticNatCmd.java | 5 +-
.../command/user/network/CreateNetworkACLCmd.java | 7 +-
.../api/command/user/network/CreateNetworkCmd.java | 3 +-
.../command/user/network/DeleteNetworkACLCmd.java | 3 +-
.../api/command/user/network/DeleteNetworkCmd.java | 2 +-
.../command/user/network/RestartNetworkCmd.java | 2 +-
.../api/command/user/network/UpdateNetworkCmd.java | 3 +-
.../command/user/project/ActivateProjectCmd.java | 2 +-
.../api/command/user/project/CreateProjectCmd.java | 4 +-
.../api/command/user/project/DeleteProjectCmd.java | 3 +-
.../user/project/DeleteProjectInvitationCmd.java | 3 +-
.../command/user/project/SuspendProjectCmd.java | 2 +-
.../api/command/user/project/UpdateProjectCmd.java | 3 +-
.../user/project/UpdateProjectInvitationCmd.java | 2 +-
.../user/resource/GetCloudIdentifierCmd.java | 3 +-
.../user/resource/UpdateResourceCountCmd.java | 2 +-
.../user/resource/UpdateResourceLimitCmd.java | 2 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../AuthorizeSecurityGroupIngressCmd.java | 5 +-
.../user/securitygroup/CreateSecurityGroupCmd.java | 3 +-
.../user/securitygroup/DeleteSecurityGroupCmd.java | 5 +-
.../RevokeSecurityGroupEgressCmd.java | 2 +-
.../RevokeSecurityGroupIngressCmd.java | 3 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 4 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 2 +-
.../command/user/snapshot/DeleteSnapshotCmd.java | 2 +-
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 3 +-
.../api/command/user/tag/CreateTagsCmd.java | 3 +-
.../api/command/user/tag/DeleteTagsCmd.java | 3 +-
.../api/command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/CreateTemplateCmd.java | 4 +-
.../command/user/template/DeleteTemplateCmd.java | 2 +-
.../command/user/template/ExtractTemplateCmd.java | 4 +-
.../command/user/template/RegisterTemplateCmd.java | 5 +-
.../command/user/template/UpdateTemplateCmd.java | 3 +-
.../api/command/user/vm/DeployVMCmd.java | 16 +-
.../api/command/user/vm/DestroyVMCmd.java | 2 +-
.../api/command/user/vm/RebootVMCmd.java | 3 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 3 +-
.../api/command/user/vm/RestoreVMCmd.java | 3 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 8 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 2 +-
.../api/command/user/vm/UpdateVMCmd.java | 3 +-
.../api/command/user/vm/UpgradeVMCmd.java | 2 +-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 2 +-
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 2 +-
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 2 +-
.../api/command/user/volume/AttachVolumeCmd.java | 3 +-
.../api/command/user/volume/CreateVolumeCmd.java | 5 +-
.../api/command/user/volume/DeleteVolumeCmd.java | 3 +-
.../api/command/user/volume/DetachVolumeCmd.java | 2 +-
.../api/command/user/volume/ExtractVolumeCmd.java | 5 +-
.../api/command/user/volume/MigrateVolumeCmd.java | 3 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 13 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 11 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 2 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 6 +-
.../api/command/user/vpc/RestartVPCCmd.java | 8 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 3 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 5 +-
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 8 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 3 +-
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 3 +-
.../command/user/vpn/DeleteVpnConnectionCmd.java | 4 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 2 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 5 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 4 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
.../virtualnetwork/VirtualRoutingResource.java | 2 +-
.../api/command/user/discovery/ListApisCmd.java | 3 +-
.../cloud/api/commands/netapp/AssociateLunCmd.java | 27 +-
.../cloud/api/commands/netapp/CreateLunCmd.java | 21 +-
.../commands/netapp/CreateVolumeOnFilerCmd.java | 49 ++--
.../api/commands/netapp/CreateVolumePoolCmd.java | 13 +-
.../api/commands/netapp/DeleteVolumePoolCmd.java | 9 +-
.../cloud/api/commands/netapp/DestroyLunCmd.java | 9 +-
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 20 +-
.../api/commands/netapp/DissociateLunCmd.java | 8 +-
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 7 +-
.../api/commands/netapp/ListVolumePoolsCmd.java | 7 +-
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 8 +-
.../com/cloud/api/commands/ConfigureSimulator.java | 3 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 5 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 5 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 2 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 15 +-
.../api/commands/AddExternalLoadBalancerCmd.java | 17 +-
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 10 +-
.../api/commands/ConfigureF5LoadBalancerCmd.java | 6 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 16 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 7 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 5 +-
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 4 +-
.../cloud/api/commands/AddExternalFirewallCmd.java | 37 ++--
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 13 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 9 +-
.../api/commands/DeleteExternalFirewallCmd.java | 21 +-
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 9 +-
.../api/commands/ListSrxFirewallNetworksCmd.java | 6 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 6 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 10 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 6 +-
.../commands/DeleteNetscalerLoadBalancerCmd.java | 7 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 5 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 5 +-
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 22 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 7 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 5 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 7 +-
python/lib/cloudutils/utilities.py | 2 +-
server/src/com/cloud/api/ApiDispatcher.java | 235 +++------------
server/src/com/cloud/api/ApiServer.java | 232 +++++++++------
server/src/com/cloud/api/ApiServlet.java | 58 ++--
.../cloud/api/commands/AddTrafficMonitorCmd.java | 4 +-
.../api/commands/DeleteTrafficMonitorCmd.java | 23 +-
.../api/commands/GenerateUsageRecordsCmd.java | 2 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 158 +++++-----
.../utils/exception/CSExceptionErrorCode.java | 32 --
258 files changed, 1042 insertions(+), 997 deletions(-)
----------------------------------------------------------------------