cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [27/52] [partial] Summary: Fixes for api_refactoring
Date Thu, 10 Jan 2013 00:48:36 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/FirewallRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/FirewallRuleResponse.java b/api/src/com/cloud/api/response/FirewallRuleResponse.java
deleted file mode 100644
index 252ad0d..0000000
--- a/api/src/com/cloud/api/response/FirewallRuleResponse.java
+++ /dev/null
@@ -1,177 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class FirewallRuleResponse extends BaseResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the port forwarding rule")
-    private IdentityProxy id = new IdentityProxy("firewall_rules");
-
-    @SerializedName(ApiConstants.PRIVATE_START_PORT) @Param(description = "the starting port of port forwarding rule's private port range")
-    private String privateStartPort;
-
-    @SerializedName(ApiConstants.PRIVATE_END_PORT) @Param(description = "the ending port of port forwarding rule's private port range")
-    private String privateEndPort;
-
-    @SerializedName(ApiConstants.PROTOCOL) @Param(description="the protocol of the port forwarding rule")
-    private String protocol;
-
-    @SerializedName(ApiConstants.PUBLIC_START_PORT) @Param(description="the starting port of port forwarding rule's public port range")
-    private String publicStartPort;
-
-    @SerializedName(ApiConstants.PUBLIC_END_PORT)  @Param(description = "the ending port of port forwarding rule's private port range")
-    private String publicEndPort;
-
-    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) @Param(description="the VM ID for the port forwarding rule")
-    private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
-
-    @SerializedName("virtualmachinename") @Param(description="the VM name for the port forwarding rule")
-    private String virtualMachineName;
-
-    @SerializedName("virtualmachinedisplayname") @Param(description="the VM display name for the port forwarding rule")
-    private String virtualMachineDisplayName;
-    
-    @SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public ip address id for the port forwarding rule")
-    private IdentityProxy publicIpAddressId = new IdentityProxy("user_ip_address");
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip address for the port forwarding rule")
-    private String publicIpAddress;
-    
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
-    private String state;
-
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
-    private String cidrList;
-    
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-    
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getPrivateStartPort() {
-        return privateStartPort;
-    }
-
-    public String getPrivateEndPort() {
-        return privateEndPort;
-    }
-
-    public void setPrivateStartPort(String privatePort) {
-        this.privateStartPort = privatePort;
-    }
-
-    public void setPrivateEndPort(String privatePort) {
-        this.privateEndPort = privatePort;
-    }    
-    
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getPublicStartPort() {
-        return publicStartPort;
-    }
-
-    public String getPublicEndPort() {
-        return publicEndPort;
-    }
-    
-    public void setPublicStartPort(String publicPort) {
-        this.publicStartPort = publicPort;
-    }
-
-    public void setPublicEndPort(String publicPort) {
-        this.publicEndPort = publicPort;
-    }
-
-    public Long getVirtualMachineId() {
-        return virtualMachineId.getValue();
-    }
-
-    public void setVirtualMachineId(Long virtualMachineId) {
-        this.virtualMachineId.setValue(virtualMachineId);
-    }
-
-    public String getVirtualMachineName() {
-        return virtualMachineName;
-    }
-
-    public void setVirtualMachineName(String virtualMachineName) {
-        this.virtualMachineName = virtualMachineName;
-    }
-
-	public String getVirtualMachineDisplayName() {
-		return virtualMachineDisplayName;
-	}
-
-	public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
-		this.virtualMachineDisplayName = virtualMachineDisplayName;
-	}
-
-	public String getPublicIpAddress() {
-		return publicIpAddress;
-	}
-
-	public void setPublicIpAddress(String publicIpAddress) {
-		this.publicIpAddress = publicIpAddress;
-	}
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public Long getPublicIpAddressId() {
-        return publicIpAddressId.getValue();
-    }
-
-    public void setPublicIpAddressId(Long publicIpAddressId) {
-        this.publicIpAddressId.setValue(publicIpAddressId);
-    }
-    
-    public String getCidrList() {
-        return cidrList;
-    }
-
-    public void setCidrList(String cidrs) {
-        this.cidrList = cidrs;
-    }
-    
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/GetVMPasswordResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/GetVMPasswordResponse.java b/api/src/com/cloud/api/response/GetVMPasswordResponse.java
deleted file mode 100644
index 41f1b6d..0000000
--- a/api/src/com/cloud/api/response/GetVMPasswordResponse.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class GetVMPasswordResponse extends BaseResponse {
-	
-	@SerializedName("encryptedpassword") @Param(description="The encrypted password of the VM")
-	private String encryptedPassword;
-	
-	public GetVMPasswordResponse() {}
-	
-	public GetVMPasswordResponse(String responseName, String encryptedPassword) {
-		setResponseName(responseName);
-		setObjectName("password");
-		setEncryptedPassword(encryptedPassword);
-	}
-
-	public String getEncryptedPassword() {
-		return encryptedPassword;
-	}
-
-	public void setEncryptedPassword(String encryptedPassword) {
-		this.encryptedPassword = encryptedPassword;
-	}
-	
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java b/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
deleted file mode 100644
index 9e98f3e..0000000
--- a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class GuestOSCategoryResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS category")
-    private IdentityProxy id = new IdentityProxy("guest_os_category");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the OS category")
-    private String name; 
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/GuestOSResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/GuestOSResponse.java b/api/src/com/cloud/api/response/GuestOSResponse.java
deleted file mode 100644
index 8efa8d8..0000000
--- a/api/src/com/cloud/api/response/GuestOSResponse.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class GuestOSResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS type")
-    private IdentityProxy id = new IdentityProxy("guest_os");
-
-    @SerializedName(ApiConstants.OS_CATEGORY_ID) @Param(description="the ID of the OS category")
-    private IdentityProxy osCategoryId = new IdentityProxy("guest_os_category");
-
-    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the name/description of the OS type")
-    private String description;
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public Long getOsCategoryId() {
-        return osCategoryId.getValue();
-    }
-
-    public void setOsCategoryId(Long osCategoryId) {
-        this.osCategoryId.setValue(osCategoryId);
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/HostResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/HostResponse.java b/api/src/com/cloud/api/response/HostResponse.java
deleted file mode 100755
index 52c96fb..0000000
--- a/api/src/com/cloud/api/response/HostResponse.java
+++ /dev/null
@@ -1,369 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.host.Host;
-import com.cloud.host.Status;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class HostResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the host")
-    private IdentityProxy id = new IdentityProxy("host");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the host")
-    private String name;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the host")
-    private Status state;
-
-    @SerializedName("disconnected") @Param(description="true if the host is disconnected. False otherwise.")
-    private Date disconnectedOn;
-
-    @SerializedName(ApiConstants.TYPE) @Param(description="the host type")
-    private Host.Type hostType;
-
-    @SerializedName("oscategoryid") @Param(description="the OS category ID of the host")
-    private IdentityProxy osCategoryId = new IdentityProxy("guest_os_category");
-
-    @SerializedName("oscategoryname") @Param(description="the OS category name of the host")
-    private String osCategoryName;
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the IP address of the host")
-    private String ipAddress;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the host")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the host")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID of the host")
-    private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
-    @SerializedName("podname") @Param(description="the Pod name of the host")
-    private String podName;
-
-    @SerializedName("version") @Param(description="the host version")
-    private String version;
-
-    @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the host hypervisor")
-    private HypervisorType hypervisor;
-
-    @SerializedName("cpunumber") @Param(description="the CPU number of the host")
-    private Integer cpuNumber;
-
-    @SerializedName("cpuspeed") @Param(description="the CPU speed of the host")
-    private Long cpuSpeed;
-
-    @SerializedName("cpuallocated") @Param(description="the amount of the host's CPU currently allocated")
-    private String cpuAllocated;
-
-    @SerializedName("cpuused") @Param(description="the amount of the host's CPU currently used")
-    private String cpuUsed;
-
-    @SerializedName("cpuwithoverprovisioning") @Param(description="the amount of the host's CPU after applying the cpu.overprovisioning.factor ")
-    private String cpuWithOverprovisioning;
-
-    @SerializedName("averageload") @Param(description="the cpu average load on the host")
-    private Long averageLoad;
-
-    @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the host")
-    private Long networkKbsRead;
-
-    @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host")
-    private Long networkKbsWrite;
-
-    @SerializedName("memorytotal") @Param(description="the memory total of the host")
-    private Long memoryTotal;
-
-    @SerializedName("memoryallocated") @Param(description="the amount of the host's memory currently allocated")
-    private Long memoryAllocated;
-
-    @SerializedName("memoryused") @Param(description="the amount of the host's memory currently used")
-    private Long memoryUsed;
-
-    @SerializedName("disksizetotal") @Param(description="the total disk size of the host")
-    private Long diskSizeTotal;
-
-    @SerializedName("disksizeallocated") @Param(description="the host's currently allocated disk size")
-    private Long diskSizeAllocated;
-
-    @SerializedName("capabilities") @Param(description="capabilities of the host")
-    private String capabilities;
-
-    @SerializedName("lastpinged") @Param(description="the date and time the host was last pinged")
-    private Date lastPinged;
-
-    @SerializedName("managementserverid") @Param(description="the management server ID of the host")
-    private Long managementServerId;
-
-    @SerializedName("clusterid") @Param(description="the cluster ID of the host")
-    private IdentityProxy clusterId = new IdentityProxy("cluster");
-
-    @SerializedName("clustername") @Param(description="the cluster name of the host")
-    private String clusterName;
-
-    @SerializedName("clustertype") @Param(description="the cluster type of the cluster that host belongs to")
-    private String clusterType;
-
-    @SerializedName("islocalstorageactive") @Param(description="true if local storage is active, false otherwise")
-    private Boolean localStorageActive;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the host was created")
-    private Date created;
-
-    @SerializedName("removed") @Param(description="the date and time the host was removed")
-    private Date removed;
-
-    @SerializedName("events") @Param(description="events available for the host")
-    private String events;
-
-    @SerializedName("hosttags") @Param(description="comma-separated list of tags for the host")
-    private String hostTags;
-
-    @SerializedName("hasenoughcapacity") @Param(description="true if this host has enough CPU and RAM capacity to migrate a VM to it, false otherwise")
-    private Boolean hasEnoughCapacity;
-
-    @SerializedName("suitableformigration") @Param(description="true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise")
-    private Boolean suitableForMigration;
-
-    @SerializedName("resourcestate") @Param(description="the resource state of the host")
-    private String resourceState;
-
-    @SerializedName(ApiConstants.HYPERVISOR_VERSION) @Param(description="the hypervisor version")
-    private String hypervisorVersion;
-
-    @SerializedName(ApiConstants.HA_HOST) @Param(description="true if the host is Ha host (dedicated to vms started by HA process; false otherwise")
-    private Boolean haHost;
-
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-    
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setState(Status state) {
-        this.state = state;
-    }
-
-    public void setDisconnectedOn(Date disconnectedOn) {
-        this.disconnectedOn = disconnectedOn;
-    }
-
-    public void setHostType(Host.Type hostType) {
-        this.hostType = hostType;
-    }
-
-    public void setOsCategoryId(Long osCategoryId) {
-        this.osCategoryId.setValue(osCategoryId);
-    }
-
-    public void setOsCategoryName(String osCategoryName) {
-        this.osCategoryName = osCategoryName;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setPodId(Long podId) {
-        this.podId.setValue(podId);
-    }
-
-    public void setPodName(String podName) {
-        this.podName = podName;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-    
-    public void setHypervisor(HypervisorType hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
-    public void setCpuNumber(Integer cpuNumber) {
-        this.cpuNumber = cpuNumber;
-    }
-    
-    public void setCpuSpeed(Long cpuSpeed) {
-        this.cpuSpeed = cpuSpeed;
-    }
-
-    public String getCpuAllocated() {
-        return cpuAllocated;
-    }
-
-    public void setCpuAllocated(String cpuAllocated) {
-        this.cpuAllocated = cpuAllocated;
-    }
-
-    public void setCpuUsed(String cpuUsed) {
-        this.cpuUsed = cpuUsed;
-    }
-
-    public void setAverageLoad(Long averageLoad) {
-        this.averageLoad = averageLoad;
-    }
-
-    public void setNetworkKbsRead(Long networkKbsRead) {
-        this.networkKbsRead = networkKbsRead;
-    }
-
-    public void setNetworkKbsWrite(Long networkKbsWrite) {
-        this.networkKbsWrite = networkKbsWrite;
-    }
-
-    public void setMemoryTotal(Long memoryTotal) {
-        this.memoryTotal = memoryTotal;
-    }
-
-    public void setMemoryAllocated(Long memoryAllocated) {
-        this.memoryAllocated = memoryAllocated;
-    }
-
-    public void setMemoryUsed(Long memoryUsed) {
-        this.memoryUsed = memoryUsed;
-    }
-
-    public void setDiskSizeTotal(Long diskSizeTotal) {
-        this.diskSizeTotal = diskSizeTotal;
-    }
-
-    public void setDiskSizeAllocated(Long diskSizeAllocated) {
-        this.diskSizeAllocated = diskSizeAllocated;
-    }
-
-    public void setCapabilities(String capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    public void setLastPinged(Date lastPinged) {
-        this.lastPinged = lastPinged;
-    }
-
-    public void setManagementServerId(Long managementServerId) {
-        this.managementServerId = managementServerId;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId.setValue(clusterId);
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public void setClusterType(String clusterType) {
-        this.clusterType = clusterType;
-    }
-
-    public void setLocalStorageActive(Boolean localStorageActive) {
-        this.localStorageActive = localStorageActive;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    public void setEvents(String events) {
-        this.events = events;
-    }
-
-    public void setHostTags(String hostTags) {
-        this.hostTags = hostTags;
-    }
-
-    public void setHasEnoughCapacity(Boolean hasEnoughCapacity) {
-        this.hasEnoughCapacity = hasEnoughCapacity;
-    }
-    
-
-    public void setSuitableForMigration(Boolean suitableForMigration) {
-        this.suitableForMigration = suitableForMigration;
-    }    
-
-    public String getResourceState() {
-        return resourceState;
-    }
-
-    public void setResourceState(String resourceState) {
-        this.resourceState = resourceState;
-    }
-
-    public String getCpuWithOverprovisioning() {
-        return cpuWithOverprovisioning;
-    }
-
-    public void setCpuWithOverprovisioning(String cpuWithOverprovisioning) {
-        this.cpuWithOverprovisioning = cpuWithOverprovisioning;
-    }
-
-    public void setHypervisorVersion(String hypervisorVersion) {
-        this.hypervisorVersion = hypervisorVersion;
-    }
-
-    public void setOsCategoryId(IdentityProxy osCategoryId) {
-        this.osCategoryId = osCategoryId;
-    }
-
-    public void setZoneId(IdentityProxy zoneId) {
-        this.zoneId = zoneId;
-    }
-
-    public void setPodId(IdentityProxy podId) {
-        this.podId = podId;
-    }
-
-    public void setClusterId(IdentityProxy clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public void setHaHost(Boolean haHost) {
-        this.haHost = haHost;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java b/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java
deleted file mode 100644
index 4c3ea44..0000000
--- a/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class HypervisorCapabilitiesResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the hypervisor capabilities row")
-    private IdentityProxy id = new IdentityProxy("hypervisor_capabilities");
-
-    @SerializedName(ApiConstants.HYPERVISOR_VERSION) @Param(description="the hypervisor version")
-    private String hypervisorVersion;
-
-    @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the hypervisor type")
-    private HypervisorType hypervisor;
-
-    @SerializedName(ApiConstants.MAX_GUESTS_LIMIT) @Param(description="the maximum number of guest vms recommended for this hypervisor")
-    private Long maxGuestsLimit;
-
-    @SerializedName(ApiConstants.SECURITY_GROUP_EANBLED) @Param(description="true if security group is supported")
-    private boolean isSecurityGroupEnabled;
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-
-    public String getHypervisorVersion() {
-        return hypervisorVersion;
-    }
-
-    public void setHypervisorVersion(String hypervisorVersion) {
-        this.hypervisorVersion = hypervisorVersion;
-    }
-
-    public HypervisorType getHypervisor() {
-        return hypervisor;
-    }
-
-    public void setHypervisor(HypervisorType hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
-    public Long getMaxGuestsLimit() {
-        return maxGuestsLimit;
-    }
-
-    public void setMaxGuestsLimit(Long maxGuestsLimit) {
-        this.maxGuestsLimit = maxGuestsLimit;
-    }
-
-    public Boolean getIsSecurityGroupEnabled() {
-        return this.isSecurityGroupEnabled;
-    }
-
-    public void setIsSecurityGroupEnabled(Boolean sgEnabled) {
-        this.isSecurityGroupEnabled = sgEnabled;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/HypervisorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/HypervisorResponse.java b/api/src/com/cloud/api/response/HypervisorResponse.java
deleted file mode 100644
index c3ce693..0000000
--- a/api/src/com/cloud/api/response/HypervisorResponse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class HypervisorResponse extends BaseResponse {
-    @SerializedName(ApiConstants.NAME) @Param(description="Hypervisor name")
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/IPAddressResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IPAddressResponse.java b/api/src/com/cloud/api/response/IPAddressResponse.java
deleted file mode 100644
index ea5b793..0000000
--- a/api/src/com/cloud/api/response/IPAddressResponse.java
+++ /dev/null
@@ -1,237 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class IPAddressResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="public IP address id")
-    private IdentityProxy id = new IdentityProxy("user_ip_address");
-    
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="public IP address")
-    private String ipAddress;
-
-    @SerializedName("allocated") @Param(description="date the public IP address was acquired")
-    private Date allocated;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the zone the public IP address belongs to")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the public IP address belongs to")
-    private String zoneName;
-
-    @SerializedName("issourcenat") @Param(description="true if the IP address is a source nat address, false otherwise")
-    private Boolean sourceNat;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account the public IP address is associated with")
-    private String accountName;
-    
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-    
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID the public IP address is associated with")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain the public IP address is associated with")
-    private String domainName;
-
-    @SerializedName(ApiConstants.FOR_VIRTUAL_NETWORK) @Param(description="the virtual network for the IP address")
-    private Boolean forVirtualNetwork;
-
-    @SerializedName(ApiConstants.VLAN_ID) @Param(description="the ID of the VLAN associated with the IP address." +
-    		" This parameter is visible to ROOT admins only")
-    private IdentityProxy vlanId = new IdentityProxy("vlan");
-
-    @SerializedName("vlanname") @Param(description="the VLAN associated with the IP address")
-    private String vlanName;
-
-    @SerializedName("isstaticnat") @Param(description="true if this ip is for static nat, false otherwise")
-    private Boolean staticNat;
-    
-    @SerializedName(ApiConstants.IS_SYSTEM) @Param(description="true if this ip is system ip (was allocated as a part of deployVm or createLbRule)")
-    private Boolean isSystem;
-    
-    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) @Param(description="virutal machine id the ip address is assigned to (not null only for static nat Ip)")
-    private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
-    
-    @SerializedName("virtualmachinename") @Param(description="virutal machine name the ip address is assigned to (not null only for static nat Ip)")
-    private String virtualMachineName;
-    
-    @SerializedName("virtualmachinedisplayname") @Param(description="virutal machine display name the ip address is assigned to (not null only for static nat Ip)")
-    private String virtualMachineDisplayName;
-    
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK_ID) @Param(description="the ID of the Network associated with the IP address")
-    private IdentityProxy associatedNetworkId = new IdentityProxy("networks");
-    
-    @SerializedName(ApiConstants.ASSOCIATED_NETWORK_NAME) @Param(description="the name of the Network associated with the IP address")
-    private String associatedNetworkName;
-    
-    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the ID of the Network where ip belongs to")
-    private IdentityProxy networkId = new IdentityProxy("networks");
-    
-    @SerializedName(ApiConstants.STATE) @Param(description="State of the ip address. Can be: Allocatin, Allocated and Releasing")
-    private String state;
-    
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
-    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-    
-    @SerializedName(ApiConstants.PURPOSE) @Param(description="purpose of the IP address. In Acton this value is not null for Ips with isSystem=true, and can have either StaticNat or LB value")
-    private String purpose;
-    
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the ip belongs to")
-    private IdentityProxy vpcId = new IdentityProxy("vpc");
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with ip address", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-/*    
-    @SerializedName(ApiConstants.JOB_ID) @Param(description="shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the volume")
-    private IdentityProxy jobId = new IdentityProxy("async_job");
-*/    
-
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public void setAllocated(Date allocated) {
-        this.allocated = allocated;
-    }
-    
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setSourceNat(Boolean sourceNat) {
-        this.sourceNat = sourceNat;
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-    
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setForVirtualNetwork(Boolean forVirtualNetwork) {
-        this.forVirtualNetwork = forVirtualNetwork;
-    }
-
-    public void setVlanId(Long vlanId) {
-        this.vlanId.setValue(vlanId);
-    }
-
-    public void setVlanName(String vlanName) {
-        this.vlanName = vlanName;
-    }
-
-	public void setStaticNat(Boolean staticNat) {
-		this.staticNat = staticNat;
-	}
-
-    public void setAssociatedNetworkId(Long networkId) {
-        this.associatedNetworkId.setValue(networkId);
-    }
-
-    public void setNetworkId(Long networkId) {
-        this.networkId.setValue(networkId);
-    }
-
-    public void setVirtualMachineId(Long virtualMachineId) {
-        this.virtualMachineId.setValue(virtualMachineId);
-    }
-
-    public void setVirtualMachineName(String virtualMachineName) {
-        this.virtualMachineName = virtualMachineName;
-    }
-
-    public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
-        this.virtualMachineDisplayName = virtualMachineDisplayName;
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-    
-    public void setPhysicalNetworkId(long physicalNetworkId) {
-        this.physicalNetworkId.setValue(physicalNetworkId);
-    }
-
-	public void setIsSystem(Boolean isSystem) {
-		this.isSystem = isSystem;
-	}
-
-    public void setPurpose(String purpose) {
-        this.purpose = purpose;
-    }
-    
-    public void setVpcId(Long vpcId) {
-        this.vpcId.setValue(vpcId);
-    }
-    
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-
-    public void setAssociatedNetworkName(String associatedNetworkName) {
-        this.associatedNetworkName = associatedNetworkName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/InstanceGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/InstanceGroupResponse.java b/api/src/com/cloud/api/response/InstanceGroupResponse.java
deleted file mode 100644
index 3b1e358..0000000
--- a/api/src/com/cloud/api/response/InstanceGroupResponse.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class InstanceGroupResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the id of the instance group")
-    private IdentityProxy id = new IdentityProxy("instance_group");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the instance group")
-    private String name;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="time and date the instance group was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the instance group")
-    private String accountName;
-    
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the group")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-    
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the group")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the instance group")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the instance group")
-    private String domainName;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-    
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java b/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
deleted file mode 100644
index 2017a3f..0000000
--- a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java
+++ /dev/null
@@ -1,134 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class IpForwardingRuleResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the port forwarding rule")
-    private IdentityProxy id = new IdentityProxy("firewall_rules");
-
-    @SerializedName(ApiConstants.PROTOCOL) @Param(description="the protocol of the port forwarding rule")
-    private String protocol;
-
-    @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID) @Param(description="the VM ID for the port forwarding rule")
-    private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
-
-    @SerializedName("virtualmachinename") @Param(description="the VM name for the port forwarding rule")
-    private String virtualMachineName;
-
-    @SerializedName("virtualmachinedisplayname") @Param(description="the VM display name for the port forwarding rule")
-    private String virtualMachineDisplayName;
-    
-    @SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public ip address id for the port forwarding rule")
-    private Long publicIpAddressId;
-
-    @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip address for the port forwarding rule")
-    private String publicIpAddress;
-    
-    @SerializedName(ApiConstants.START_PORT) @Param(description="the start port of the rule")
-    private Integer startPort;
-    
-    @SerializedName(ApiConstants.END_PORT) @Param(description="the end port of the rule")
-    private Integer endPort;
-    
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the ip forwarding rule")
-    private String state;
-    
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public Long getVirtualMachineId() {
-        return virtualMachineId.getValue();
-    }
-
-    public void setVirtualMachineId(Long virtualMachineId) {
-        this.virtualMachineId.setValue(virtualMachineId);
-    }
-
-    public String getVirtualMachineName() {
-        return virtualMachineName;
-    }
-
-    public void setVirtualMachineName(String virtualMachineName) {
-        this.virtualMachineName = virtualMachineName;
-    }
-
-	public String getVirtualMachineDisplayName() {
-		return virtualMachineDisplayName;
-	}
-
-	public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
-		this.virtualMachineDisplayName = virtualMachineDisplayName;
-	}
-
-	public String getPublicIpAddress() {
-		return publicIpAddress;
-	}
-
-	public void setPublicIpAddress(String publicIpAddress) {
-		this.publicIpAddress = publicIpAddress;
-	}
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public Integer getStartPort() {
-        return startPort;
-    }
-
-    public void setStartPort(Integer startPort) {
-        this.startPort = startPort;
-    }
-
-    public Integer getEndPort() {
-        return endPort;
-    }
-
-    public void setEndPort(Integer endPort) {
-        this.endPort = endPort;
-    }
-
-    public Long getPublicIpAddressId() {
-        return publicIpAddressId;
-    }
-
-    public void setPublicIpAddressId(Long publicIpAddressId) {
-        this.publicIpAddressId = publicIpAddressId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/IsoVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/IsoVmResponse.java b/api/src/com/cloud/api/response/IsoVmResponse.java
deleted file mode 100755
index 29a898a..0000000
--- a/api/src/com/cloud/api/response/IsoVmResponse.java
+++ /dev/null
@@ -1,145 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class IsoVmResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ISO ID")
-    private IdentityProxy id = new IdentityProxy("vm_template");
-
-    @SerializedName("name") @Param(description="the ISO name")
-    private String name;
-
-    @SerializedName("displaytext") @Param(description="the ISO display text")
-    private String displayText;
-
-    @SerializedName("bootable") @Param(description="true if the ISO is bootable, false otherwise")
-    private Boolean bootable;
-
-    @SerializedName("isfeatured") @Param(description="true if this template is a featured template, false otherwise")
-    private Boolean featured;
-
-    @SerializedName("ostypeid") @Param(description="the ID of the OS type for this template.")
-    private IdentityProxy osTypeId = new IdentityProxy("guest_os");
-
-    @SerializedName("ostypename") @Param(description="the name of the OS type for this template.")
-    private String osTypeName;
-
-    @SerializedName("virtualmachineid") @Param(description="id of the virtual machine")
-    private IdentityProxy virtualMachineId = new IdentityProxy("vm_instance");
-
-    @SerializedName("vmname") @Param(description="name of the virtual machine")
-    private String virtualMachineName;
-
-    @SerializedName("vmdisplayname") @Param(description="display name of the virtual machine")
-    private String virtualMachineDisplayName;
-
-    @SerializedName("vmstate") @Param(description="state of the virtual machine")
-    private String virtualMachineState;
-
-    
-    public Long getOsTypeId() {
-        return osTypeId.getValue();
-    }
-
-    public void setOsTypeId(Long osTypeId) {
-        this.osTypeId.setValue(osTypeId);
-    }
-
-    public String getOsTypeName() {
-        return osTypeName;
-    }
-
-    public void setOsTypeName(String osTypeName) {
-        this.osTypeName = osTypeName;
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDisplayText() {
-        return displayText;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public Boolean isBootable() {
-        return bootable;
-    }
-
-    public void setBootable(Boolean bootable) {
-        this.bootable = bootable;
-    }
-
-    public Boolean isFeatured() {
-        return featured;
-    }
-
-    public void setFeatured(Boolean featured) {
-        this.featured = featured;
-    }
-
-    public Long getVirtualMachineId() {
-        return virtualMachineId.getValue();
-    }
-
-    public void setVirtualMachineId(Long virtualMachineId) {
-        this.virtualMachineId.setValue(virtualMachineId);
-    }
-
-    public String getVirtualMachineName() {
-        return virtualMachineName;
-    }
-
-    public void setVirtualMachineName(String virtualMachineName) {
-        this.virtualMachineName = virtualMachineName;
-    }
-
-    public String getVirtualMachineDisplayName() {
-        return virtualMachineDisplayName;
-    }
-
-    public void setVirtualMachineDisplayName(String virtualMachineDisplayName) {
-        this.virtualMachineDisplayName = virtualMachineDisplayName;
-    }
-
-    public String getVirtualMachineState() {
-        return virtualMachineState;
-    }
-
-    public void setVirtualMachineState(String virtualMachineState) {
-        this.virtualMachineState = virtualMachineState;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java b/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
deleted file mode 100644
index 0d1212d..0000000
--- a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java
+++ /dev/null
@@ -1,128 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.utils.IdentityProxy;
-import com.cloud.network.rules.StickinessPolicy;
-import com.cloud.serializer.Param;
-import com.cloud.utils.Pair;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-public class LBStickinessPolicyResponse extends BaseResponse {
-    @SerializedName("id")
-    @Param(description = "the LB Stickiness policy ID")
-    private IdentityProxy id = new IdentityProxy("load_balancer_stickiness_policies");
-    
-    @SerializedName("name")
-    @Param(description = "the name of the Stickiness policy")
-    private String name;
-
-    @SerializedName("methodname")
-    @Param(description = "the method name of the Stickiness policy")
-    private String methodName;
-
-    @SerializedName("description")
-    @Param(description = "the description of the Stickiness policy")
-    private String description;;
-
-    @SerializedName("state")
-    @Param(description = "the state of the policy")
-    private String state;
-
-    // FIXME : if prams with the same name exists more then once then value are concatinated with ":" as delimitor .
-    // Reason: Map does not support duplicate keys, need to look for the alernate data structure
-    // Example: <params>{indirect=null, name=testcookie, nocache=null, domain=www.yahoo.com:www.google.com, postonly=null}</params>
-    // in the above there are two domains with values www.yahoo.com and www.google.com
-    @SerializedName("params")
-    @Param(description = "the params of the policy")
-    private Map<String, String> params;
-    
-    public Map<String, String> getParams() {
-        return params;
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getMethodName() {
-        return methodName;
-    }
-    
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public LBStickinessPolicyResponse(StickinessPolicy stickinesspolicy) {
-        this.name = stickinesspolicy.getName();
-        List<Pair<String, String>> paramsList = stickinesspolicy.getParams();
-        this.methodName = stickinesspolicy.getMethodName();
-        this.description = stickinesspolicy.getDescription();
-        if (stickinesspolicy.isRevoke()) {
-            this.setState("Revoked");
-        }
-        if (stickinesspolicy.getId() != 0)
-            setId(stickinesspolicy.getId());
-
-        /* Get the param and values from the database and fill the response object 
-         *  The following loop is to 
-         *    1) convert from List of Pair<String,String> to Map<String, String> 
-         *    2)  combine all params with name with ":" , currently we have one param called "domain" that can appear multiple times.
-         * */
-
-        Map<String, String> tempParamList =  new HashMap<String, String>();
-        for(Pair<String,String> paramKV :paramsList){
-            String key = paramKV.first();
-            String value = paramKV.second();
-            StringBuilder sb = new StringBuilder();
-            sb.append(value);
-            if (tempParamList.get(key) != null)
-            {
-                sb.append(":").append(tempParamList.get(key));
-            }
-                
-            tempParamList.put(key,sb.toString());
-        }
-
-        this.params = tempParamList;
-        setObjectName("stickinesspolicy");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/LBStickinessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LBStickinessResponse.java b/api/src/com/cloud/api/response/LBStickinessResponse.java
deleted file mode 100644
index 278fdf3..0000000
--- a/api/src/com/cloud/api/response/LBStickinessResponse.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-
-public class LBStickinessResponse extends BaseResponse {
-    @SerializedName("lbruleid")
-    @Param(description = "the LB rule ID")
-    private IdentityProxy lbRuleId = new IdentityProxy("firewall_rules");
-
-    @SerializedName("name")
-    @Param(description = "the name of the Stickiness policy")
-    private String name;
-
-    @SerializedName("description")
-    @Param(description = "the description of the Stickiness policy")
-    private String description;;
-
-    @SerializedName("account")
-    @Param(description = "the account of the Stickiness policy")
-    private String accountName;
-    
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the domain ID of the Stickiness policy")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName("domain")
-    @Param(description = "the domain of the Stickiness policy")
-    private String domainName;
-
-    @SerializedName("state")
-    @Param(description = "the state of the policy")
-    private String state;
-    
-    @SerializedName(ApiConstants.ZONE_ID)
-    @Param(description = "the id of the zone the Stickiness policy belongs to")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName("stickinesspolicy")
-    @Param(description = "the list of stickinesspolicies", responseObject = LBStickinessPolicyResponse.class)
-    private List<LBStickinessPolicyResponse> stickinessPolicies;
-
-    public void setlbRuleId(Long lbRuleId) {
-        this.lbRuleId.setValue(lbRuleId);
-    }
-
-    public void setRules(List<LBStickinessPolicyResponse> policies) {
-        this.stickinessPolicies = policies;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<LBStickinessPolicyResponse> getStickinessPolicies() {
-        return stickinessPolicies;
-    }
-    
-    public String getDescription() {
-        return description;
-    }
-    
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-    
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-    
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public LBStickinessResponse() {
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/LDAPConfigResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LDAPConfigResponse.java b/api/src/com/cloud/api/response/LDAPConfigResponse.java
deleted file mode 100644
index 3e56c95..0000000
--- a/api/src/com/cloud/api/response/LDAPConfigResponse.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class LDAPConfigResponse  extends BaseResponse {
-
-    @SerializedName(ApiConstants.HOST_NAME) @Param(description="Hostname or ip address of the ldap server eg: my.ldap.com")
-    private String hostname;
-
-    @SerializedName(ApiConstants.PORT) @Param(description="Specify the LDAP port if required, default is 389")
-    private String port;
-
-    @SerializedName(ApiConstants.PORT) @Param(description="Check Use SSL if the external LDAP server is configured for LDAP over SSL")
-    private String useSSL;
-
-    @SerializedName(ApiConstants.SEARCH_BASE) @Param(description="The search base defines the starting point for the search in the directory tree Example:  dc=cloud,dc=com")
-    private String searchBase;
-
-    @SerializedName(ApiConstants.QUERY_FILTER) @Param(description="You specify a query filter here, which narrows down the users, who can be part of this domain")
-    private String queryFilter;
-
-    @SerializedName(ApiConstants.BIND_DN) @Param(description="Specify the distinguished name of a user with the search permission on the directory")
-    private String bindDN;
-
-    @SerializedName(ApiConstants.BIND_PASSWORD) @Param(description="DN password")
-    private String bindPassword;
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    public String getPort() {
-        return port;
-    }
-
-    public void setPort(String port) {
-        this.port = port;
-    }
-
-    public String getUseSSL() {
-        return useSSL;
-    }
-
-    public void setUseSSL(String useSSL) {
-        this.useSSL = useSSL;
-    }
-
-    public String getSearchBase() {
-        return searchBase;
-    }
-
-    public void setSearchBase(String searchBase) {
-        this.searchBase = searchBase;
-    }
-
-    public String getQueryFilter() {
-        return queryFilter;
-    }
-
-    public void setQueryFilter(String queryFilter) {
-        this.queryFilter = queryFilter;
-    }
-
-    public String getBindDN() {
-        return bindDN;
-    }
-
-    public void setBindDN(String bindDN) {
-        this.bindDN = bindDN;
-    }
-
-    public String getBindPassword() {
-        return bindPassword;
-    }
-
-    public void setBindPassword(String bindPassword) {
-        this.bindPassword = bindPassword;
-    }
-    
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/LDAPRemoveResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LDAPRemoveResponse.java b/api/src/com/cloud/api/response/LDAPRemoveResponse.java
deleted file mode 100644
index b3cdd9c..0000000
--- a/api/src/com/cloud/api/response/LDAPRemoveResponse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class LDAPRemoveResponse extends BaseResponse {
-
-	public LDAPRemoveResponse(){
-		super();
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/ListResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/ListResponse.java b/api/src/com/cloud/api/response/ListResponse.java
deleted file mode 100644
index ebba402..0000000
--- a/api/src/com/cloud/api/response/ListResponse.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.List;
-
-import com.cloud.api.ResponseObject;
-
-public class ListResponse<T extends ResponseObject> extends BaseResponse {
-    List<T> responses;
-    private transient Integer count;
-
-    public List<T> getResponses() {
-        return responses;
-    }
-
-    public void setResponses(List<T> responses) {
-        this.responses = responses;
-    }
-    
-    public void setResponses(List<T> responses, Integer count) {
-        this.responses = responses;
-        this.count = count;
-    }
-    
-
-    public Integer getCount() {
-        if (count != null) {
-            return count;
-        }
-        
-        if (responses != null) {
-            return responses.size();
-        }
-        
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/LoadBalancerResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/LoadBalancerResponse.java b/api/src/com/cloud/api/response/LoadBalancerResponse.java
deleted file mode 100644
index 016bccc..0000000
--- a/api/src/com/cloud/api/response/LoadBalancerResponse.java
+++ /dev/null
@@ -1,162 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class LoadBalancerResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID)
-    @Param(description = "the load balancer rule ID")
-    private IdentityProxy id = new IdentityProxy("firewall_rules");
-
-    @SerializedName(ApiConstants.NAME)
-    @Param(description = "the name of the load balancer")
-    private String name;
-
-    @SerializedName(ApiConstants.DESCRIPTION)
-    @Param(description = "the description of the load balancer")
-    private String description;
-
-    @SerializedName(ApiConstants.PUBLIC_IP_ID)
-    @Param(description = "the public ip address id")
-    private IdentityProxy publicIpId = new IdentityProxy("user_ip_address");
-
-    @SerializedName(ApiConstants.PUBLIC_IP)
-    @Param(description = "the public ip address")
-    private String publicIp;
-
-    @SerializedName(ApiConstants.PUBLIC_PORT)
-    @Param(description = "the public port")
-    private String publicPort;
-
-    @SerializedName(ApiConstants.PRIVATE_PORT)
-    @Param(description = "the private port")
-    private String privatePort;
-
-    @SerializedName(ApiConstants.ALGORITHM)
-    @Param(description = "the load balancer algorithm (source, roundrobin, leastconn)")
-    private String algorithm;
-    
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
-    private String cidrList;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account of the load balancer rule")
-    private String accountName;
-    
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the load balancer")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-    
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the load balancer")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the domain ID of the load balancer rule")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain of the load balancer rule")
-    private String domainName;
-
-    @SerializedName(ApiConstants.STATE)
-    @Param(description = "the state of the rule")
-    private String state;
-
-    @SerializedName(ApiConstants.ZONE_ID)
-    @Param(description = "the id of the zone the rule belongs to")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-    
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with load balancer", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public void setPublicPort(String publicPort) {
-        this.publicPort = publicPort;
-    }
-
-    public void setPrivatePort(String privatePort) {
-        this.privatePort = privatePort;
-    }
-
-    public void setCidrList(String cidrs) {
-        this.cidrList = cidrs;
-    }
-
-    public void setAlgorithm(String algorithm) {
-        this.algorithm = algorithm;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setPublicIpId(Long publicIpId) {
-        this.publicIpId.setValue(publicIpId);
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-    
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-   
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/NetworkACLResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkACLResponse.java b/api/src/com/cloud/api/response/NetworkACLResponse.java
deleted file mode 100644
index 10f312b..0000000
--- a/api/src/com/cloud/api/response/NetworkACLResponse.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class NetworkACLResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of the ACL")
-    private IdentityProxy id = new IdentityProxy("firewall_rules");
-
-    @SerializedName(ApiConstants.PROTOCOL) @Param(description="the protocol of the ACL")
-    private String protocol;
-
-    @SerializedName(ApiConstants.START_PORT) @Param(description="the starting port of ACL's port range")
-    private String startPort;
-
-    @SerializedName(ApiConstants.END_PORT)  @Param(description = "the ending port of ACL's port range")
-    private String endPort;
-
-    @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type for the ACL")
-    private String trafficType;
-    
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the rule")
-    private String state;
-
-    @SerializedName(ApiConstants.CIDR_LIST) @Param(description="the cidr list to forward traffic from")
-    private String cidrList;
-    
-    @SerializedName(ApiConstants.ICMP_TYPE) @Param(description= "type of the icmp message being sent")
-    private Integer icmpType;
-
-    @SerializedName(ApiConstants.ICMP_CODE) @Param(description = "error code for this icmp message")
-    private Integer icmpCode;
-    
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with the network ACLs",
-            responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public void setStartPort(String startPort) {
-        this.startPort = startPort;
-    }
-
-    public void setEndPort(String endPort) {
-        this.endPort = endPort;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setCidrList(String cidrList) {
-        this.cidrList = cidrList;
-    }
-
-    public void setIcmpType(Integer icmpType) {
-        this.icmpType = icmpType;
-    }
-
-    public void setIcmpCode(Integer icmpCode) {
-        this.icmpCode = icmpCode;
-    }
-
-    public void setTrafficType(String trafficType) {
-        this.trafficType = trafficType;
-    }
-    
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/api/response/NetworkOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/NetworkOfferingResponse.java b/api/src/com/cloud/api/response/NetworkOfferingResponse.java
deleted file mode 100644
index 4b8abf9..0000000
--- a/api/src/com/cloud/api/response/NetworkOfferingResponse.java
+++ /dev/null
@@ -1,152 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.api.response;
-
-import java.util.Date;
-import java.util.List;
-
-import com.cloud.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class NetworkOfferingResponse extends BaseResponse{
-    @SerializedName("id") @Param(description="the id of the network offering")
-    private final IdentityProxy id = new IdentityProxy("network_offerings");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the name of the network offering")
-    private String name;
-    
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="an alternate display text of the network offering.")
-    private String displayText;
-    
-    @SerializedName(ApiConstants.TAGS) @Param(description="the tags for the network offering")
-    private String tags;
-    
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this network offering was created")
-    private Date created;
-    
-    @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the traffic type for the network offering, supported types are Public, Management, Control, Guest, Vlan or Storage.")
-    private String trafficType;
-    
-    @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if network offering is default, false otherwise")
-    private Boolean isDefault;
-   
-    @SerializedName(ApiConstants.SPECIFY_VLAN) @Param(description="true if network offering supports vlans, false otherwise")
-    private Boolean specifyVlan;
-    
-    @SerializedName(ApiConstants.CONSERVE_MODE) @Param(description="true if network offering is ip conserve mode enabled")
-    private Boolean conserveMode;
-
-    @SerializedName(ApiConstants.SPECIFY_IP_RANGES) @Param(description="true if network offering supports specifying ip ranges, false otherwise")
-    private Boolean specifyIpRanges;
-    
-    @SerializedName(ApiConstants.AVAILABILITY) @Param(description="availability of the network offering")
-    private String availability;
-    
-    @SerializedName(ApiConstants.NETWORKRATE) @Param(description="data transfer rate in megabits per second allowed.")
-    private Integer networkRate;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="state of the network offering. Can be Disabled/Enabled/Inactive")
-    private String state;
-    
-    @SerializedName(ApiConstants.GUEST_IP_TYPE) @Param(description="guest type of the network offering, can be Shared or Isolated")
-    private String guestIpType;
-    
-    @SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering used by virtual router provider")
-    private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
-   
-    @SerializedName(ApiConstants.SERVICE) @Param(description="the list of supported services", responseObject = ServiceResponse.class)
-    private List<ServiceResponse> services;
-    
-    @SerializedName(ApiConstants.FOR_VPC) @Param(description="true if network offering can be used by VPC networks only")
-    private Boolean forVpc;
-    
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-    
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setTrafficType(String trafficType) {
-        this.trafficType = trafficType;
-    }
-
-    public void setIsDefault(Boolean isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    public void setSpecifyVlan(Boolean specifyVlan) {
-        this.specifyVlan = specifyVlan;
-    }
-
-    public void setConserveMode(Boolean conserveMode) {
-        this.conserveMode = conserveMode;
-    }
-
-    public void setAvailability(String availability) {
-        this.availability = availability;
-    }
-
-    public void setNetworkRate(Integer networkRate) {
-        this.networkRate = networkRate;
-    }
-
-    public void setServices(List<ServiceResponse> services) {
-        this.services = services;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setGuestIpType(String type) {
-        this.guestIpType = type;
-    }
-
-    public void setServiceOfferingId(Long serviceOfferingId) {
-        this.serviceOfferingId.setValue(serviceOfferingId);
-    }
-
-	public void setServiceOfferingId(IdentityProxy serviceOfferingId) {
-		this.serviceOfferingId = serviceOfferingId;
-	}
-
-	public void setSpecifyIpRanges(Boolean specifyIpRanges) {
-		this.specifyIpRanges = specifyIpRanges;
-	}
-
-    public void setForVpc(Boolean forVpc) {
-        this.forVpc = forVpc;
-    }
-}


Mime
View raw message