Merge branch 'improvement/annotations_xen_kvm' This closes #280
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c6758f9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c6758f9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c6758f9 Branch: refs/heads/master Commit: 0c6758f9178637e9b49c59919a83e4297d9ddaf9 Parents: ad6ac9bb 3228854 Author: wilderrodrigues <[email protected]> Authored: Fri May 22 12:55:53 2015 +0200 Committer: wilderrodrigues <[email protected]> Committed: Fri May 22 12:55:53 2015 +0200 ---------------------------------------------------------------------- core/src/com/cloud/resource/CommandWrapper.java | 1 - core/src/com/cloud/resource/RequestWrapper.java | 34 ++++ .../src/com/cloud/resource/ResourceWrapper.java | 35 ++++ .../wrapper/LibvirtAttachIsoCommandWrapper.java | 2 + .../LibvirtAttachVolumeCommandWrapper.java | 2 + .../LibvirtBackupSnapshotCommandWrapper.java | 2 + ...virtCheckConsoleProxyLoadCommandWrapper.java | 2 + .../LibvirtCheckHealthCommandWrapper.java | 2 + .../LibvirtCheckNetworkCommandWrapper.java | 2 + .../LibvirtCheckOnHostCommandWrapper.java | 6 +- .../wrapper/LibvirtCheckSshCommandWrapper.java | 2 + ...ibvirtCheckVirtualMachineCommandWrapper.java | 2 + ...ibvirtCleanupNetworkRulesCommandWrapper.java | 2 + .../LibvirtCopyVolumeCommandWrapper.java | 2 + .../wrapper/LibvirtCreateCommandWrapper.java | 2 + ...ivateTemplateFromSnapshotCommandWrapper.java | 2 + ...PrivateTemplateFromVolumeCommandWrapper.java | 2 + .../LibvirtCreateStoragePoolCommandWrapper.java | 2 + ...tCreateVolumeFromSnapshotCommandWrapper.java | 2 + .../LibvirtDeleteStoragePoolCommandWrapper.java | 6 +- .../wrapper/LibvirtDestroyCommandWrapper.java | 4 +- .../wrapper/LibvirtFenceCommandWrapper.java | 2 + .../LibvirtGetHostStatsCommandWrapper.java | 2 + .../LibvirtGetStorageStatsCommandWrapper.java | 2 + .../LibvirtGetVmDiskStatsCommandWrapper.java | 2 + .../LibvirtGetVmStatsCommandWrapper.java | 2 + .../LibvirtGetVncPortCommandWrapper.java | 2 + .../wrapper/LibvirtMaintainCommandWrapper.java | 2 + .../LibvirtManageSnapshotCommandWrapper.java | 6 +- .../wrapper/LibvirtMigrateCommandWrapper.java | 2 + .../LibvirtModifySshKeysCommandWrapper.java | 2 + .../LibvirtModifyStoragePoolCommandWrapper.java | 2 + .../LibvirtNetworkElementCommandWrapper.java | 2 + ...bvirtNetworkRulesSystemVmCommandWrapper.java | 2 + ...NetworkRulesVmSecondaryIpCommandWrapper.java | 2 + .../LibvirtNetworkUsageCommandWrapper.java | 2 + .../LibvirtOvsCreateTunnelCommandWrapper.java | 2 + .../LibvirtOvsDestroyBridgeCommandWrapper.java | 2 + .../LibvirtOvsDestroyTunnelCommandWrapper.java | 2 + .../LibvirtOvsFetchInterfaceCommandWrapper.java | 2 + .../LibvirtOvsSetupBridgeCommandWrapper.java | 2 + ...VpcPhysicalTopologyConfigCommandWrapper.java | 2 + ...OvsVpcRoutingPolicyConfigCommandWrapper.java | 2 + .../wrapper/LibvirtPingTestCommandWrapper.java | 2 + .../wrapper/LibvirtPlugNicCommandWrapper.java | 6 +- ...ibvirtPrepareForMigrationCommandWrapper.java | 2 + ...irtPrimaryStorageDownloadCommandWrapper.java | 2 + .../LibvirtPvlanSetupCommandWrapper.java | 2 + .../wrapper/LibvirtReadyCommandWrapper.java | 2 + .../wrapper/LibvirtRebootCommandWrapper.java | 2 + .../LibvirtRebootRouterCommandWrapper.java | 2 + .../resource/wrapper/LibvirtRequestWrapper.java | 121 +------------ .../LibvirtResizeVolumeCommandWrapper.java | 2 + ...LibvirtSecurityGroupRulesCommandWrapper.java | 2 + .../wrapper/LibvirtStartCommandWrapper.java | 2 + .../wrapper/LibvirtStopCommandWrapper.java | 2 + .../LibvirtStorageSubSystemCommandWrapper.java | 2 + .../wrapper/LibvirtUnPlugNicCommandWrapper.java | 2 + .../LibvirtUpgradeSnapshotCommandWrapper.java | 2 + ...virtWatchConsoleProxyLoadCommandWrapper.java | 2 + .../xenserver/resource/CitrixResourceBase.java | 14 +- .../wrapper/CitrixAttachIsoCommandWrapper.java | 2 + .../CitrixAttachVolumeCommandWrapper.java | 2 + ...trixCheckConsoleProxyLoadCommandWrapper.java | 2 + .../CitrixCheckHealthCommandWrapper.java | 2 + .../CitrixCheckNetworkCommandWrapper.java | 2 + .../CitrixCheckOnHostCommandWrapper.java | 2 + .../wrapper/CitrixCheckSshCommandWrapper.java | 2 + ...CitrixCheckVirtualMachineCommandWrapper.java | 2 + .../CitrixCleanupNetworkRulesCmdWrapper.java | 2 + ...trixClusterVMMetaDataSyncCommandWrapper.java | 2 + .../wrapper/CitrixCreateCommandWrapper.java | 2 + .../CitrixCreateStoragePoolCommandWrapper.java | 2 + .../CitrixCreateVMSnapshotCommandWrapper.java | 2 + .../CitrixDeleteStoragePoolCommandWrapper.java | 2 + .../CitrixDeleteVMSnapshotCommandWrapper.java | 2 + .../wrapper/CitrixDestroyCommandWrapper.java | 2 + .../CitrixGetHostStatsCommandWrapper.java | 2 + .../CitrixGetStorageStatsCommandWrapper.java | 2 + .../CitrixGetVmDiskStatsCommandWrapper.java | 2 + .../wrapper/CitrixGetVmStatsCommandWrapper.java | 2 + .../wrapper/CitrixGetVncPortCommandWrapper.java | 2 + .../wrapper/CitrixMaintainCommandWrapper.java | 2 + .../wrapper/CitrixMigrateCommandWrapper.java | 2 + .../CitrixModifySshKeysCommandWrapper.java | 2 + .../CitrixModifyStoragePoolCommandWrapper.java | 2 + .../CitrixNetworkElementCommandWrapper.java | 2 + ...itrixNetworkRulesSystemVmCommandWrapper.java | 2 + ...NetworkRulesVmSecondaryIpCommandWrapper.java | 2 + .../CitrixOvsCreateGreTunnelCommandWrapper.java | 2 + .../CitrixOvsCreateTunnelCommandWrapper.java | 2 + .../CitrixOvsDeleteFlowCommandWrapper.java | 2 + .../CitrixOvsDestroyBridgeCommandWrapper.java | 2 + .../CitrixOvsDestroyTunnelCommandWrapper.java | 2 + .../CitrixOvsFetchInterfaceCommandWrapper.java | 2 + .../CitrixOvsSetTagAndFlowCommandWrapper.java | 2 + .../CitrixOvsSetupBridgeCommandWrapper.java | 2 + ...VpcPhysicalTopologyConfigCommandWrapper.java | 2 + ...OvsVpcRoutingPolicyConfigCommandWrapper.java | 2 + .../CitrixPerformanceMonitorCommandWrapper.java | 2 + .../wrapper/CitrixPingTestCommandWrapper.java | 2 + .../wrapper/CitrixPlugNicCommandWrapper.java | 2 + ...CitrixPrepareForMigrationCommandWrapper.java | 2 + ...rixPrimaryStorageDownloadCommandWrapper.java | 2 + .../wrapper/CitrixPvlanSetupCommandWrapper.java | 2 + .../wrapper/CitrixReadyCommandWrapper.java | 2 + .../wrapper/CitrixRebootCommandWrapper.java | 2 + .../CitrixRebootRouterCommandWrapper.java | 2 + .../resource/wrapper/CitrixRequestWrapper.java | 176 ++++--------------- .../CitrixResizeVolumeCommandWrapper.java | 2 + .../CitrixRevertToVMSnapshotCommandWrapper.java | 2 + .../wrapper/CitrixScaleVmCommandWrapper.java | 2 + .../CitrixSecurityGroupRulesCommandWrapper.java | 2 + .../wrapper/CitrixSetupCommandWrapper.java | 2 + .../wrapper/CitrixStartCommandWrapper.java | 2 + .../wrapper/CitrixStopCommandWrapper.java | 2 + .../CitrixStorageSubSystemCommandWrapper.java | 38 ++++ .../wrapper/CitrixUnPlugNicCommandWrapper.java | 2 + .../CitrixUpdateHostPasswordCommandWrapper.java | 2 + .../CitrixUpgradeSnapshotCommandWrapper.java | 2 + ...trixWatchConsoleProxyLoadCommandWrapper.java | 2 + .../XcpServerNetworkUsageCommandWrapper.java | 52 ------ .../XenServer56CheckOnHostCommandWrapper.java | 48 ----- .../XenServer56FP1FenceCommandWrapper.java | 92 ---------- .../wrapper/XenServer56FenceCommandWrapper.java | 71 -------- .../XenServer56NetworkUsageCommandWrapper.java | 103 ----------- ...XenServer610MigrateVolumeCommandWrapper.java | 71 -------- ...rver610MigrateWithStorageCommandWrapper.java | 137 --------------- ...igrateWithStorageCompleteCommandWrapper.java | 81 --------- ...MigrateWithStorageReceiveCommandWrapper.java | 91 ---------- ...610MigrateWithStorageSendCommandWrapper.java | 143 --------------- ...enServer620SP1GetGPUStatsCommandWrapper.java | 51 ------ .../XcpServerNetworkUsageCommandWrapper.java | 54 ++++++ .../XenServer56CheckOnHostCommandWrapper.java | 50 ++++++ .../xen56/XenServer56FenceCommandWrapper.java | 73 ++++++++ .../XenServer56NetworkUsageCommandWrapper.java | 104 +++++++++++ .../XenServer56FP1FenceCommandWrapper.java | 94 ++++++++++ ...XenServer610MigrateVolumeCommandWrapper.java | 73 ++++++++ ...rver610MigrateWithStorageCommandWrapper.java | 139 +++++++++++++++ ...igrateWithStorageCompleteCommandWrapper.java | 83 +++++++++ ...MigrateWithStorageReceiveCommandWrapper.java | 93 ++++++++++ ...610MigrateWithStorageSendCommandWrapper.java | 145 +++++++++++++++ ...enServer620SP1GetGPUStatsCommandWrapper.java | 53 ++++++ .../wrapper/CitrixRequestWrapperTest.java | 22 +++ 144 files changed, 1374 insertions(+), 1214 deletions(-) ----------------------------------------------------------------------
