From 4f263a56b29968dfdf676541574f67423dd7ba9f Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 8 Nov 2011 19:11:36 -0800 Subject: [PATCH] fix the build --- .../com/cloud/api/response/AsyncJobResponse.java | 2 +- .../com/cloud/api/response/SystemVmResponse.java | 1 + client/tomcatconf/commands-ext.properties.in | 13 ------------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/api/src/com/cloud/api/response/AsyncJobResponse.java b/api/src/com/cloud/api/response/AsyncJobResponse.java index 4afdfba1665..de7609dbfd6 100644 --- a/api/src/com/cloud/api/response/AsyncJobResponse.java +++ b/api/src/com/cloud/api/response/AsyncJobResponse.java @@ -147,7 +147,7 @@ public class AsyncJobResponse extends BaseResponse { this.jobInstanceId.setTableName("vm_template"); } else { // TODO : when we hit here, we need to add instanceType -> UUID entity table mapping - assert(false); + //assert(false); } } } diff --git a/api/src/com/cloud/api/response/SystemVmResponse.java b/api/src/com/cloud/api/response/SystemVmResponse.java index e493c330f7e..881d816bfba 100644 --- a/api/src/com/cloud/api/response/SystemVmResponse.java +++ b/api/src/com/cloud/api/response/SystemVmResponse.java @@ -106,6 +106,7 @@ public class SystemVmResponse extends BaseResponse { @SerializedName("activeviewersessions") @Param(description="the number of active console sessions for the console proxy system vm") private Integer activeViewerSessions; + @SerializedName("objectId") @Param(description="the object id") private Long objectId; public Long getObjectId() { diff --git a/client/tomcatconf/commands-ext.properties.in b/client/tomcatconf/commands-ext.properties.in index c63f776a6d6..1b1f91d892c 100644 --- a/client/tomcatconf/commands-ext.properties.in +++ b/client/tomcatconf/commands-ext.properties.in @@ -23,16 +23,3 @@ addTrafficMonitor=com.cloud.api.commands.AddTrafficMonitorCmd;1 deleteTrafficMonitor=com.cloud.api.commands.DeleteTrafficMonitorCmd;1 listTrafficMonitors=com.cloud.api.commands.ListTrafficMonitorsCmd;1 -####Netapp integration commands -createVolumeOnFiler=com.cloud.api.commands.netapp.CreateVolumeOnFilerCmd;15 -destroyVolumeOnFiler=com.cloud.api.commands.netapp.DestroyVolumeOnFilerCmd;15 -listVolumesOnFiler=com.cloud.api.commands.netapp.ListVolumesOnFilerCmd;15 -createLunOnFiler=com.cloud.api.commands.netapp.CreateLunCmd;15 -destroyLunOnFiler=com.cloud.api.commands.netapp.DestroyLunCmd;15 -listLunsOnFiler=com.cloud.api.commands.netapp.ListLunsCmd;15 -associateLun=com.cloud.api.commands.netapp.AssociateLunCmd;15 -dissociateLun=com.cloud.api.commands.netapp.DissociateLunCmd;15 -createVolumePool=com.cloud.api.commands.netapp.CreateVolumePoolCmd;15 -deleteVolumePool=com.cloud.api.commands.netapp.DeleteVolumePoolCmd;15 -modifyVolumePool=com.cloud.api.commands.netapp.ModifyVolumePoolCmd;15 -listVolumePools=com.cloud.api.commands.netapp.ListVolumePoolsCmd;15