Skip to content

Commit b12aebe

Browse files
nitinmehnitinmeh
committed
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
This reverts commit e0019ec.
1 parent 43c7126 commit b12aebe

18 files changed

Lines changed: 161 additions & 676 deletions

File tree

‎api/src/com/cloud/event/EventTypes.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public class EventTypes {
5959
public static final String EVENT_VM_REBOOT = "VM.REBOOT";
6060
public static final String EVENT_VM_UPDATE = "VM.UPDATE";
6161
public static final String EVENT_VM_UPGRADE = "VM.UPGRADE";
62-
public static final String EVENT_VM_SCALE = "VM.SCALE";
6362
public static final String EVENT_VM_RESETPASSWORD = "VM.RESETPASSWORD";
6463
public static final String EVENT_VM_RESETSSHKEY = "VM.RESETSSHKEY";
6564
public static final String EVENT_VM_MIGRATE = "VM.MIGRATE";

‎api/src/com/cloud/vm/UserVmService.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,18 @@
2323

2424
import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
2525
import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
26-
import org.apache.cloudstack.api.command.user.vm.*;
26+
import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd;
27+
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
28+
import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
29+
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
30+
import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd;
31+
import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
32+
import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd;
33+
import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
34+
import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
35+
import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd;
36+
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
37+
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
2738
import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
2839
import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
2940
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
@@ -390,7 +401,4 @@ UserVm createVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityExceptio
390401
VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool);
391402

392403
UserVm restoreVM(RestoreVMCmd cmd);
393-
394-
UserVm upgradeVirtualMachine(ScaleVMCmd scaleVMCmd) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;
395-
396404
}

‎api/src/com/cloud/vm/VirtualMachine.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public enum State {
4141
Destroyed(false, "VM is marked for destroy."),
4242
Expunging(true, "VM is being expunged."),
4343
Migrating(true, "VM is being migrated. host id holds to from host"),
44-
Reconfiguring(true, "VM is being reconfigured to a new service offering"),
4544
Error(false, "VM is in error"),
4645
Unknown(false, "VM state is unknown."),
4746
Shutdowned(false, "VM is shutdowned from inside");
@@ -96,9 +95,6 @@ public static StateMachine2<State, VirtualMachine.Event, VirtualMachine> getStat
9695
s_fsm.addTransition(State.Running, VirtualMachine.Event.StopRequested, State.Stopping);
9796
s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportShutdowned, State.Stopped);
9897
s_fsm.addTransition(State.Running, VirtualMachine.Event.AgentReportMigrated, State.Running);
99-
s_fsm.addTransition(State.Running, VirtualMachine.Event.ReconfiguringRequested, State.Reconfiguring);
100-
s_fsm.addTransition(State.Reconfiguring, VirtualMachine.Event.OperationSucceeded, State.Running);
101-
s_fsm.addTransition(State.Reconfiguring, VirtualMachine.Event.OperationFailed, State.Running);
10298
s_fsm.addTransition(State.Migrating, VirtualMachine.Event.MigrationRequested, State.Migrating);
10399
s_fsm.addTransition(State.Migrating, VirtualMachine.Event.OperationSucceeded, State.Running);
104100
s_fsm.addTransition(State.Migrating, VirtualMachine.Event.OperationFailed, State.Running);
@@ -180,8 +176,7 @@ public enum Event {
180176
AgentReportShutdowned,
181177
AgentReportMigrated,
182178
RevertRequested,
183-
SnapshotRequested,
184-
ReconfiguringRequested
179+
SnapshotRequested
185180
};
186181

187182
public enum Type {
@@ -299,8 +294,4 @@ public static boolean isSystemVM(VirtualMachine.Type vmtype) {
299294

300295
public Map<String, String> getDetails();
301296

302-
public Boolean getSameHost();
303-
304-
public Long getNewSvcOfferingId();
305-
306297
}

‎api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

‎client/tomcatconf/commands.properties.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ listVirtualMachines=15
6666
getVMPassword=15
6767
restoreVirtualMachine=15
6868
changeServiceForVirtualMachine=15
69-
scaleVirtualMachine=15
7069
assignVirtualMachine=1
7170
migrateVirtualMachine=1
7271
recoverVirtualMachine=7

‎core/src/com/cloud/vm/VMInstanceVO.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,6 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
151151
@Transient
152152
Map<String, String> details;
153153

154-
@Transient
155-
Long newSvcOfferingId;
156-
157-
@Transient
158-
Boolean sameHost;
159-
160154
@Column(name="uuid")
161155
protected String uuid = UUID.randomUUID().toString();
162156
;
@@ -486,22 +480,4 @@ public Long getDiskOfferingId() {
486480
return diskOfferingId;
487481
}
488482

489-
@Override
490-
public Long getNewSvcOfferingId() {
491-
return newSvcOfferingId;
492-
}
493-
494-
public void setNewSvcOfferingId(Long oldSvcOfferingId) {
495-
this.newSvcOfferingId = oldSvcOfferingId;
496-
}
497-
498-
@Override
499-
public Boolean getSameHost() {
500-
return sameHost;
501-
}
502-
503-
public void setSameHost(Boolean sameHost) {
504-
this.sameHost = sameHost;
505-
}
506-
507-
}
483+
}

0 commit comments

Comments
 (0)