You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/08 04:29:49 UTC

[5/57] api: Refactor command and response classes to org.apache.cloudstack.api.*

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java b/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
deleted file mode 100644
index 0022019..0000000
--- a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java
+++ /dev/null
@@ -1,96 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class Site2SiteVpnGatewayResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the vpn gateway ID")
-    private IdentityProxy id = new IdentityProxy("s2s_vpn_gateway");
-
-    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="the public IP address")
-    private String ip;
-
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="the vpc id of this gateway")
-    private IdentityProxy vpcId = new IdentityProxy("vpc");
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the owner")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the owner")
-    private String domain;
-
-    @SerializedName(ApiConstants.REMOVED) @Param(description="the date and time the host was removed")
-    private Date removed;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public void setVpcId(Long vpcId) {
-        this.vpcId.setValue(vpcId);
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    @Override
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domain = domainName;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SnapshotPolicyResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SnapshotPolicyResponse.java b/api/src/com/cloud/api/response/SnapshotPolicyResponse.java
deleted file mode 100644
index ac1b6cb..0000000
--- a/api/src/com/cloud/api/response/SnapshotPolicyResponse.java
+++ /dev/null
@@ -1,89 +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 SnapshotPolicyResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the snapshot policy")
-    private IdentityProxy id = new IdentityProxy("snapshot_policy");
-
-    @SerializedName("volumeid") @Param(description="the ID of the disk volume")
-    private IdentityProxy volumeId = new IdentityProxy("volumes");
-
-    @SerializedName("schedule") @Param(description="time the snapshot is scheduled to be taken.")
-    private String schedule;
-
-    @SerializedName("intervaltype") @Param(description="the interval type of the snapshot policy")
-    private short intervalType;
-
-    @SerializedName("maxsnaps") @Param(description="maximum number of snapshots retained")
-    private int maxSnaps;
-
-    @SerializedName("timezone") @Param(description="the time zone of the snapshot policy")
-    private String timezone;
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public Long getVolumeId() {
-        return volumeId.getValue();
-    }
-
-    public void setVolumeId(Long volumeId) {
-        this.volumeId.setValue(volumeId);
-    }
-
-    public String getSchedule() {
-        return schedule;
-    }
-
-    public void setSchedule(String schedule) {
-        this.schedule = schedule;
-    }
-
-    public short getIntervalType() {
-        return intervalType;
-    }
-
-    public void setIntervalType(short intervalType) {
-        this.intervalType = intervalType;
-    }
-
-    public int getMaxSnaps() {
-        return maxSnaps;
-    }
-
-    public void setMaxSnaps(int maxSnaps) {
-        this.maxSnaps = maxSnaps;
-    }
-
-    public String getTimezone() {
-        return timezone;
-    }
-
-    public void setTimezone(String timezone) {
-        this.timezone = timezone;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SnapshotResponse.java b/api/src/com/cloud/api/response/SnapshotResponse.java
deleted file mode 100644
index 9a6d53f..0000000
--- a/api/src/com/cloud/api/response/SnapshotResponse.java
+++ /dev/null
@@ -1,165 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.storage.Snapshot;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class SnapshotResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID)
-    @Param(description = "ID of the snapshot")
-    private IdentityProxy id = new IdentityProxy("snapshots");
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account associated with the snapshot")
-    private String accountName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the domain ID of the snapshot's account")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain name of the snapshot's account")
-    private String domainName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the snapshot")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the snapshot")
-    private String projectName;
-
-    @SerializedName(ApiConstants.SNAPSHOT_TYPE)
-    @Param(description = "the type of the snapshot")
-    private String snapshotType;
-
-    @SerializedName(ApiConstants.VOLUME_ID)
-    @Param(description = "ID of the disk volume")
-    private IdentityProxy volumeId = new IdentityProxy("volumes");
-
-    @SerializedName(ApiConstants.VOLUME_NAME)
-    @Param(description = "name of the disk volume")
-    private String volumeName;
-
-    @SerializedName("volumetype")
-    @Param(description = "type of the disk volume")
-    private String volumeType;
-
-    @SerializedName(ApiConstants.CREATED)
-    @Param(description = "  the date the snapshot was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.NAME)
-    @Param(description = "name of the snapshot")
-    private String name;
-
-    @SerializedName(ApiConstants.INTERVAL_TYPE)
-    @Param(description = "valid types are hourly, daily, weekly, monthy, template, and none.")
-    private String intervalType;
-
-    @SerializedName(ApiConstants.STATE)
-    @Param(description = "the state of the snapshot. BackedUp means that snapshot is ready to be used; Creating - the snapshot is being allocated on the primary storage; BackingUp - the snapshot is being backed up on secondary storage")
-    private Snapshot.Status state;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with snapshot", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    private Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public Long getDomainId() {
-        return domainId.getValue();
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public void setSnapshotType(String snapshotType) {
-        this.snapshotType = snapshotType;
-    }
-
-    public void setVolumeId(Long volumeId) {
-        this.volumeId.setValue(volumeId);
-    }
-
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    public void setVolumeType(String volumeType) {
-        this.volumeType = volumeType;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setIntervalType(String intervalType) {
-        this.intervalType = intervalType;
-    }
-
-    public void setState(Snapshot.Status state) {
-        this.state = state;
-    }
-
-    @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/e398b1e4/api/src/com/cloud/api/response/SnapshotScheduleResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SnapshotScheduleResponse.java b/api/src/com/cloud/api/response/SnapshotScheduleResponse.java
deleted file mode 100644
index 37f82b8..0000000
--- a/api/src/com/cloud/api/response/SnapshotScheduleResponse.java
+++ /dev/null
@@ -1,69 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class SnapshotScheduleResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the snapshot schedule")
-    private IdentityProxy id = new IdentityProxy("snapshot_schedule");
-
-    @SerializedName("volumeid") @Param(description="the volume ID the snapshot schedule applied for")
-    private IdentityProxy volumeId = new IdentityProxy("volumes");
-
-    @SerializedName("snapshotpolicyid") @Param(description="the snapshot policy ID used by the snapshot schedule")
-    private IdentityProxy snapshotPolicyId = new IdentityProxy("snapshot_policy");
-
-    @SerializedName("scheduled") @Param(description="time the snapshot is scheduled to be taken")
-    private Date scheduled;
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public Long getVolumeId() {
-        return volumeId.getValue();
-    }
-
-    public void setVolumeId(Long volumeId) {
-        this.volumeId.setValue(volumeId);
-    }
-
-    public Long getSnapshotPolicyId() {
-        return snapshotPolicyId.getValue();
-    }
-
-    public void setSnapshotPolicyId(Long snapshotPolicyId) {
-        this.snapshotPolicyId.setValue(snapshotPolicyId);
-    }
-
-    public Date getScheduled() {
-        return scheduled;
-    }
-
-    public void setScheduled(Date scheduled) {
-        this.scheduled = scheduled;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/StaticRouteResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StaticRouteResponse.java b/api/src/com/cloud/api/response/StaticRouteResponse.java
deleted file mode 100644
index b607e32..0000000
--- a/api/src/com/cloud/api/response/StaticRouteResponse.java
+++ /dev/null
@@ -1,113 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{
-    @SerializedName(ApiConstants.ID) @Param(description="the ID of static route")
-    private IdentityProxy id = new IdentityProxy("static_routes");
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the static route")
-    private String state;
-
-    @SerializedName(ApiConstants.VPC_ID) @Param(description="VPC the static route belongs to")
-    private IdentityProxy vpcId = new IdentityProxy("vpc");
-
-    @SerializedName(ApiConstants.GATEWAY_ID) @Param(description="VPC gateway the route is created for")
-    private IdentityProxy gatewayId = new IdentityProxy("vpc_gateways");
-
-    @SerializedName(ApiConstants.CIDR) @Param(description="static route CIDR")
-    private String cidr;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account associated with the static route")
-    private String accountName;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the static route")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the static route")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID)
-    @Param(description = "the ID of the domain associated with the static route")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.DOMAIN)
-    @Param(description = "the domain associated with the static route")
-    private String domainName;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with static route",
-            responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setVpcId(Long vpcId) {
-        this.vpcId.setValue(vpcId);
-    }
-
-    public void setGatewayId(Long gatewayId) {
-        this.gatewayId.setValue(gatewayId);
-    }
-
-    public void setCidr(String cidr) {
-        this.cidr = cidr;
-    }
-
-    @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;
-    }
-
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/StatusResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StatusResponse.java b/api/src/com/cloud/api/response/StatusResponse.java
deleted file mode 100644
index 283766e..0000000
--- a/api/src/com/cloud/api/response/StatusResponse.java
+++ /dev/null
@@ -1,32 +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.google.gson.annotations.SerializedName;
-
-public class StatusResponse extends BaseResponse {
-    @SerializedName("status")
-    private Boolean status;
-
-    public Boolean getStatus() {
-       return status;
-    }
-
-   public void setStatus(Boolean status) {
-       this.status = status;
-   }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java b/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java
deleted file mode 100755
index 18e122f..0000000
--- a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class StorageNetworkIpRangeResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the uuid of storage network IP range.")
-    private String uuid;
-
-    @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
-    private Integer vlan;
-
-    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod uuid for the storage network IP range")
-    private String podUuid;
-
-    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the storage network IP range")
-    private String startIp;
-
-    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the storage network IP range")
-    private String endIp;
-
-    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the storage network IP range")
-    private String gateway;
-
-    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network uuid of storage network IP range")
-    private String networkUuid;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone uuid of the storage network IP range")
-    private String zoneUuid;
-
-    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the storage network IP range")
-    private String netmask;
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public void setZoneUuid(String zoneUuid) {
-        this.zoneUuid = zoneUuid;
-    }
-
-    public void setVlan(Integer vlan) {
-        this.vlan = vlan;
-    }
-
-    public void setPodUuid(String podUuid) {
-        this.podUuid = podUuid;
-    }
-
-    public void setStartIp(String startIp) {
-        this.startIp = startIp;
-    }
-
-    public void setEndIp(String endIp) {
-        this.endIp = endIp;
-    }
-
-    public void setNetworkUuid(String networkUuid) {
-        this.networkUuid = networkUuid;
-    }
-
-    public void setNetmask(String netmask) {
-        this.netmask = netmask;
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/StoragePoolResponse.java b/api/src/com/cloud/api/response/StoragePoolResponse.java
deleted file mode 100755
index d0d60ec..0000000
--- a/api/src/com/cloud/api/response/StoragePoolResponse.java
+++ /dev/null
@@ -1,220 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.cloud.storage.StoragePoolStatus;
-import com.google.gson.annotations.SerializedName;
-
-public class StoragePoolResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the storage pool")
-    private IdentityProxy id = new IdentityProxy("storage_pool");
-
-    @SerializedName("zoneid") @Param(description="the Zone ID of the storage pool")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the storage pool")
-    private String zoneName;
-
-    @SerializedName("podid") @Param(description="the Pod ID of the storage pool")
-    private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
-    @SerializedName("podname") @Param(description="the Pod name of the storage pool")
-    private String podName;
-
-    @SerializedName("name") @Param(description="the name of the storage pool")
-    private String name;
-
-    @SerializedName("ipaddress") @Param(description="the IP address of the storage pool")
-    private String ipAddress;
-
-    @SerializedName("path") @Param(description="the storage pool path")
-    private String path;
-
-    @SerializedName("created") @Param(description="the date and time the storage pool was created")
-    private Date created;
-
-    @SerializedName("type") @Param(description="the storage pool type")
-    private String type;
-
-    @SerializedName("clusterid") @Param(description="the ID of the cluster for the storage pool")
-    private IdentityProxy clusterId = new IdentityProxy("cluster");
-
-    @SerializedName("clustername") @Param(description="the name of the cluster for the storage pool")
-    private String clusterName;
-
-    @SerializedName("disksizetotal") @Param(description="the total disk size of the storage pool")
-    private Long diskSizeTotal;
-
-    @SerializedName("disksizeallocated") @Param(description="the host's currently allocated disk size")
-    private Long diskSizeAllocated;
-
-    @SerializedName("disksizeused") @Param(description="the host's currently used disk size")
-    private Long diskSizeUsed;
-
-    @SerializedName("tags") @Param(description="the tags for the storage pool")
-    private String tags;
-
-    @SerializedName(ApiConstants.STATE) @Param(description="the state of the storage pool")
-    private StoragePoolStatus state;
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public Long getZoneId() {
-        return zoneId.getValue();
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public String getZoneName() {
-        return zoneName;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public Long getPodId() {
-        return podId.getValue();
-    }
-
-    public void setPodId(Long podId) {
-        this.podId.setValue(podId);
-    }
-
-    public String getPodName() {
-        return podName;
-    }
-
-    public void setPodName(String podName) {
-        this.podName = podName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Long getClusterId() {
-        return clusterId.getValue();
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId.setValue(clusterId);
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public Long getDiskSizeTotal() {
-        return diskSizeTotal;
-    }
-
-    public void setDiskSizeTotal(Long diskSizeTotal) {
-        this.diskSizeTotal = diskSizeTotal;
-    }
-
-    public Long getDiskSizeAllocated() {
-        return diskSizeAllocated;
-    }
-
-    public void setDiskSizeAllocated(Long diskSizeAllocated) {
-        this.diskSizeAllocated = diskSizeAllocated;
-    }
-
-    public Long getDiskSizeUsed() {
-        return diskSizeUsed;
-    }
-
-    public void setDiskSizeUsed(Long diskSizeUsed) {
-        this.diskSizeUsed = diskSizeUsed;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public StoragePoolStatus getState() {
-        return state;
-    }
-
-    public void setState(StoragePoolStatus state) {
-        this.state = state;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SuccessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SuccessResponse.java b/api/src/com/cloud/api/response/SuccessResponse.java
deleted file mode 100644
index 7f22116..0000000
--- a/api/src/com/cloud/api/response/SuccessResponse.java
+++ /dev/null
@@ -1,50 +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 SuccessResponse extends BaseResponse {
-	 @SerializedName("success") @Param(description="true if operation is executed successfully")
-	 private Boolean success = true;
-
-     @SerializedName("displaytext") @Param(description="any text associated with the success or failure")
-     private String displayText;
-
-	 public Boolean getSuccess() {
-	 	return success;
-	 }
-
-	public void setSuccess(Boolean success) {
-		this.success = success;
-	}
-
-	public String getDisplayText() {
-	    return displayText;
-	}
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public SuccessResponse() {}
-
-    public SuccessResponse(String responseName) {
-    	super.setResponseName(responseName);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SwiftResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SwiftResponse.java b/api/src/com/cloud/api/response/SwiftResponse.java
deleted file mode 100755
index bf77149..0000000
--- a/api/src/com/cloud/api/response/SwiftResponse.java
+++ /dev/null
@@ -1,89 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class SwiftResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID)
-    @Param(description = "the ID of swift")
-    private IdentityProxy id = new IdentityProxy("swift");
-
-    @SerializedName(ApiConstants.URL)
-    @Param(description = "url for swift")
-    private String url;
-
-    @SerializedName(ApiConstants.CREATED)
-    @Param(description = "the date and time the host was created")
-    private Date created;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the account for swift")
-    private String account;
-
-    @SerializedName(ApiConstants.ACCOUNT)
-    @Param(description = "the username for swift")
-    private String username;
-
-
-    @Override
-    public Long getObjectId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SystemVmInstanceResponse.java b/api/src/com/cloud/api/response/SystemVmInstanceResponse.java
deleted file mode 100644
index 322c532..0000000
--- a/api/src/com/cloud/api/response/SystemVmInstanceResponse.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 com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-/*
- * This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
- */
-public class SystemVmInstanceResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the system VM")
-    private IdentityProxy id = new IdentityProxy("vm_instance");
-
-    @SerializedName("systemvmtype") @Param(description="the system VM type")
-    private String systemVmType;
-
-    @SerializedName("name") @Param(description="the name of the system VM")
-    private String name;
-
-    @SerializedName("hostid") @Param(description="the host ID for the system VM")
-    private IdentityProxy hostId = new IdentityProxy("host");
-
-    @SerializedName("state") @Param(description="the state of the system VM")
-    private String state;
-
-    @SerializedName("role") @Param(description="the role of the system VM")
-    private String role;
-
-
-    public Long getObjectId() {
-    	return getId();
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getSystemVmType() {
-        return systemVmType;
-    }
-
-    public void setSystemVmType(String systemVmType) {
-        this.systemVmType = systemVmType;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getHostId() {
-        return hostId.getValue();
-    }
-
-    public void setHostId(Long hostId) {
-        this.hostId.setValue(hostId);
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/SystemVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/SystemVmResponse.java b/api/src/com/cloud/api/response/SystemVmResponse.java
deleted file mode 100644
index 40ca34b..0000000
--- a/api/src/com/cloud/api/response/SystemVmResponse.java
+++ /dev/null
@@ -1,317 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class SystemVmResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the ID of the system VM")
-    private IdentityProxy id = new IdentityProxy("vm_instance");
-
-    @SerializedName("systemvmtype") @Param(description="the system VM type")
-    private String systemVmType;
-
-    @SerializedName("jobid") @Param(description="the job ID associated with the system VM. This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private IdentityProxy jobId = new IdentityProxy("async_job");
-
-    @SerializedName("jobstatus") @Param(description="the job status associated with the system VM.  This is only displayed if the router listed is part of a currently running asynchronous job.")
-    private Integer jobStatus;
-
-    @SerializedName("zoneid") @Param(description="the Zone ID for the system VM")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the system VM")
-    private String zoneName;
-
-    @SerializedName("dns1") @Param(description="the first DNS for the system VM")
-    private String dns1;
-
-    @SerializedName("dns2") @Param(description="the second DNS for the system VM")
-    private String dns2;
-
-    @SerializedName("networkdomain") @Param(description="the network domain for the system VM")
-    private String networkDomain;
-
-    @SerializedName("gateway") @Param(description="the gateway for the system VM")
-    private String gateway;
-
-    @SerializedName("name") @Param(description="the name of the system VM")
-    private String name;
-
-    @SerializedName("podid") @Param(description="the Pod ID for the system VM")
-    private IdentityProxy podId = new IdentityProxy("host_pod_ref");
-
-    @SerializedName("hostid") @Param(description="the host ID for the system VM")
-    private IdentityProxy hostId = new IdentityProxy("host");
-
-    @SerializedName("hostname") @Param(description="the hostname for the system VM")
-    private String hostName;
-
-    @SerializedName(ApiConstants.PRIVATE_IP) @Param(description="the private IP address for the system VM")
-    private String privateIp;
-
-    @SerializedName(ApiConstants.PRIVATE_MAC_ADDRESS) @Param(description="the private MAC address for the system VM")
-    private String privateMacAddress;
-
-    @SerializedName(ApiConstants.PRIVATE_NETMASK) @Param(description="the private netmask for the system VM")
-    private String privateNetmask;
-
-    @SerializedName(ApiConstants.LINK_LOCAL_IP) @Param(description="the link local IP address for the system vm")
-    private String linkLocalIp;
-
-    @SerializedName(ApiConstants.LINK_LOCAL_MAC_ADDRESS) @Param(description="the link local MAC address for the system vm")
-    private String linkLocalMacAddress;
-
-    @SerializedName(ApiConstants.LINK_LOCAL_MAC_NETMASK) @Param(description="the link local netmask for the system vm")
-    private String linkLocalNetmask;
-
-    @SerializedName("publicip") @Param(description="the public IP address for the system VM")
-    private String publicIp;
-
-    @SerializedName("publicmacaddress") @Param(description="the public MAC address for the system VM")
-    private String publicMacAddress;
-
-    @SerializedName("publicnetmask") @Param(description="the public netmask for the system VM")
-    private String publicNetmask;
-
-    @SerializedName("templateid") @Param(description="the template ID for the system VM")
-    private IdentityProxy templateId = new IdentityProxy("vm_template");
-
-    @SerializedName("created") @Param(description="the date and time the system VM was created")
-    private Date created;
-
-    @SerializedName("state") @Param(description="the state of the system VM")
-    private String state;
-
-    @SerializedName("activeviewersessions") @Param(description="the number of active console sessions for the console proxy system vm")
-    private Integer activeViewerSessions;
-
-    private Long objectId;
-
-    public Long getObjectId() {
-        return objectId;
-    }
-
-    public void setObjectId(Long objectId) {
-        this.objectId = objectId;
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getSystemVmType() {
-        return systemVmType;
-    }
-
-    public void setSystemVmType(String systemVmType) {
-        this.systemVmType = systemVmType;
-    }
-
-    public Long getZoneId() {
-        return zoneId.getValue();
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public String getZoneName() {
-        return zoneName;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public String getDns1() {
-        return dns1;
-    }
-
-    public void setDns1(String dns1) {
-        this.dns1 = dns1;
-    }
-
-    public String getDns2() {
-        return dns2;
-    }
-
-    public void setDns2(String dns2) {
-        this.dns2 = dns2;
-    }
-
-    public String getNetworkDomain() {
-        return networkDomain;
-    }
-
-    public void setNetworkDomain(String networkDomain) {
-        this.networkDomain = networkDomain;
-    }
-
-    public String getGateway() {
-        return gateway;
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getPodId() {
-        return podId.getValue();
-    }
-
-    public void setPodId(Long podId) {
-        this.podId.setValue(podId);
-    }
-
-    public Long getHostId() {
-        return hostId.getValue();
-    }
-
-    public void setHostId(Long hostId) {
-        this.hostId.setValue(hostId);
-    }
-
-    public String getHostName() {
-        return hostName;
-    }
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    public String getPrivateIp() {
-        return privateIp;
-    }
-
-    public void setPrivateIp(String privateIp) {
-        this.privateIp = privateIp;
-    }
-
-    public String getPrivateMacAddress() {
-        return privateMacAddress;
-    }
-
-    public void setPrivateMacAddress(String privateMacAddress) {
-        this.privateMacAddress = privateMacAddress;
-    }
-
-    public String getPrivateNetmask() {
-        return privateNetmask;
-    }
-
-    public void setPrivateNetmask(String privateNetmask) {
-        this.privateNetmask = privateNetmask;
-    }
-
-    public String getPublicIp() {
-        return publicIp;
-    }
-
-    public void setPublicIp(String publicIp) {
-        this.publicIp = publicIp;
-    }
-
-    public String getPublicMacAddress() {
-        return publicMacAddress;
-    }
-
-    public void setPublicMacAddress(String publicMacAddress) {
-        this.publicMacAddress = publicMacAddress;
-    }
-
-    public String getPublicNetmask() {
-        return publicNetmask;
-    }
-
-    public void setPublicNetmask(String publicNetmask) {
-        this.publicNetmask = publicNetmask;
-    }
-
-    public Long getTemplateId() {
-        return templateId.getValue();
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId.setValue(templateId);
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public Integer getActiveViewerSessions() {
-        return activeViewerSessions;
-    }
-
-    public void setActiveViewerSessions(Integer activeViewerSessions) {
-        this.activeViewerSessions = activeViewerSessions;
-    }
-
-    public String getLinkLocalIp() {
-        return linkLocalIp;
-    }
-
-    public void setLinkLocalIp(String linkLocalIp) {
-        this.linkLocalIp = linkLocalIp;
-    }
-
-    public String getLinkLocalMacAddress() {
-        return linkLocalMacAddress;
-    }
-
-    public void setLinkLocalMacAddress(String linkLocalMacAddress) {
-        this.linkLocalMacAddress = linkLocalMacAddress;
-    }
-
-    public String getLinkLocalNetmask() {
-        return linkLocalNetmask;
-    }
-
-    public void setLinkLocalNetmask(String linkLocalNetmask) {
-        this.linkLocalNetmask = linkLocalNetmask;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java b/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
deleted file mode 100644
index b578f66..0000000
--- a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java
+++ /dev/null
@@ -1,63 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class TemplatePermissionsResponse extends BaseResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the template ID")
-    private IdentityProxy id = new IdentityProxy("vm_template");
-
-    @SerializedName(ApiConstants.IS_PUBLIC) @Param(description="true if this template is a public template, false otherwise")
-    private Boolean publicTemplate;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain to which the template belongs")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the list of accounts the template is available for")
-    private List<String> accountNames;
-
-    @SerializedName(ApiConstants.PROJECT_IDS) @Param(description="the list of projects the template is available for")
-    private List<String> projectIds;
-
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public void setPublicTemplate(Boolean publicTemplate) {
-        this.publicTemplate = publicTemplate;
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setAccountNames(List<String> accountNames) {
-        this.accountNames = accountNames;
-    }
-
-    public void setProjectIds(List<String> projectIds) {
-        this.projectIds = projectIds;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TemplateResponse.java b/api/src/com/cloud/api/response/TemplateResponse.java
deleted file mode 100755
index 3cb6938..0000000
--- a/api/src/com/cloud/api/response/TemplateResponse.java
+++ /dev/null
@@ -1,288 +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 java.util.Map;
-
-import org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.cloud.storage.Storage.ImageFormat;
-import com.cloud.utils.IdentityProxy;
-import com.google.gson.annotations.SerializedName;
-
-@SuppressWarnings("unused")
-public class TemplateResponse extends BaseResponse implements ControlledEntityResponse {
-    @SerializedName(ApiConstants.ID) @Param(description="the template ID")
-    private IdentityProxy id = new IdentityProxy("vm_template");
-
-    @SerializedName(ApiConstants.NAME) @Param(description="the template name")
-    private String name;
-
-    @SerializedName(ApiConstants.DISPLAY_TEXT) @Param(description="the template display text")
-    private String displayText;
-
-    @SerializedName(ApiConstants.IS_PUBLIC) // propName="public"  (FIXME:  this used to be part of Param annotation, do we need it?)
-    @Param(description="true if this template is a public template, false otherwise")
-    private boolean isPublic;
-
-    @SerializedName(ApiConstants.CREATED) @Param(description="the date this template was created")
-    private Date created;
-
-    @SerializedName("removed") @Param(description="the date this template was removed")
-    private Date removed;
-
-    @SerializedName(ApiConstants.IS_READY) // propName="ready"  (FIXME:  this used to be part of Param annotation, do we need it?)
-    @Param(description="true if the template is ready to be deployed from, false otherwise.")
-    private boolean isReady;
-
-    @SerializedName(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the reset password feature is enabled, false otherwise")
-    private Boolean passwordEnabled;
-
-    @SerializedName(ApiConstants.FORMAT) @Param(description="the format of the template.")
-    private ImageFormat format;
-
-    @SerializedName(ApiConstants.BOOTABLE) @Param(description="true if the ISO is bootable, false otherwise")
-    private Boolean bootable;
-
-    @SerializedName(ApiConstants.IS_FEATURED) @Param(description="true if this template is a featured template, false otherwise")
-    private boolean featured;
-
-    @SerializedName("crossZones") @Param(description="true if the template is managed across all Zones, false otherwise")
-    private boolean crossZones;
-
-    @SerializedName(ApiConstants.OS_TYPE_ID) @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(ApiConstants.ACCOUNT_ID) @Param(description="the account id to which the template belongs")
-    private IdentityProxy accountId = new IdentityProxy("account");
-
-    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account name to which the template belongs")
-    private String account;
-
-    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the zone for this template")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone for this template")
-    private String zoneName;
-
-    @SerializedName(ApiConstants.STATUS) @Param(description="the status of the template")
-    private String status;
-
-    @SerializedName(ApiConstants.SIZE) @Param(description="the size of the template")
-    private Long size;
-
-    @SerializedName("templatetype") @Param(description="the type of the template")
-    private String templateType;
-
-    @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the hypervisor on which the template runs")
-    private String hypervisor;
-
-    @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain to which the template belongs")
-    private String domainName;
-
-    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain to which the template belongs")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName(ApiConstants.IS_EXTRACTABLE) @Param(description="true if the template is extractable, false otherwise")
-    private Boolean extractable;
-
-    @SerializedName(ApiConstants.CHECKSUM) @Param(description="checksum of the template")
-    private String checksum;
-
-    @SerializedName("sourcetemplateid") @Param(description="the template ID of the parent template if present")
-    private IdentityProxy sourcetemplateId = new IdentityProxy("vm_template");
-
-    @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the secondary storage host for the template")
-    private IdentityProxy hostId = new IdentityProxy("host");
-
-    @SerializedName("hostname") @Param(description="the name of the secondary storage host for the template")
-    private String hostName;
-
-    @SerializedName(ApiConstants.TEMPLATE_TAG) @Param(description="the tag of this template")
-    private String templateTag;
-
-    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the template")
-    private IdentityProxy projectId = new IdentityProxy("projects");
-
-    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the template")
-    private String projectName;
-
-    @SerializedName(ApiConstants.DETAILS) @Param(description="additional key/value details tied with template")
-    private Map details;
-
-    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with tempate", responseObject = ResourceTagResponse.class)
-    private List<ResourceTagResponse> tags;
-
-
-    @Override
-    public Long getObjectId() {
-        return getId();
-    }
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setAccountId(Long accountId) {
-        this.accountId.setValue(accountId);
-    }
-
-    public void setAccountName(String account) {
-        this.account = account;
-    }
-
-    public void setOsTypeId(Long osTypeId) {
-        this.osTypeId.setValue(osTypeId);
-    }
-
-    public void setOsTypeName(String osTypeName) {
-        this.osTypeName = osTypeName;
-    }
-
-    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 setPublic(boolean isPublic) {
-        this.isPublic = isPublic;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public void setRemoved(Date removed) {
-        this.removed = removed;
-    }
-
-    public void setReady(boolean isReady) {
-        this.isReady = isReady;
-    }
-
-    public void setPasswordEnabled(boolean passwordEnabled) {
-        this.passwordEnabled = passwordEnabled;
-    }
-
-    public void setFormat(ImageFormat format) {
-        this.format = format;
-    }
-
-    public void setBootable(Boolean bootable) {
-        this.bootable = bootable;
-    }
-
-    public void setFeatured(boolean featured) {
-        this.featured = featured;
-    }
-
-    public void setCrossZones(boolean crossZones) {
-        this.crossZones = crossZones;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setSize(Long size) {
-        this.size = size;
-    }
-
-    public void setTemplateType(String templateType) {
-        this.templateType = templateType;
-    }
-
-    public void setHypervisor(String hypervisor) {
-        this.hypervisor = hypervisor;
-    }
-
-    @Override
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    @Override
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public void setExtractable(Boolean extractable) {
-        this.extractable = extractable;
-    }
-
-    public void setChecksum(String checksum) {
-        this.checksum = checksum;
-    }
-
-    public void setSourceTemplateId(Long sourcetemplateId) {
-        this.sourcetemplateId.setValue(sourcetemplateId);
-    }
-
-    public void setHostId(Long hostId) {
-        this.hostId.setValue(hostId);
-    }
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    public void setTemplateTag(String templateTag) {
-        this.templateTag = templateTag;
-    }
-
-    @Override
-    public void setProjectId(Long projectId) {
-        this.projectId.setValue(projectId);
-    }
-
-    @Override
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public Map getDetails() {
-        return this.details;
-    }
-
-    public void setDetails(Map details) {
-        this.details = details;
-    }
-
-    public void setTags(List<ResourceTagResponse> tags) {
-        this.tags = tags;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java b/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
deleted file mode 100755
index b2691b3..0000000
--- a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java
+++ /dev/null
@@ -1,37 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class TrafficTypeImplementorResponse extends BaseResponse {
-     @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="network traffic type")
-     private String trafficType;
-
-     @SerializedName(ApiConstants.TRAFFIC_TYPE_IMPLEMENTOR) @Param(description="implementor of network traffic type")
-     private String implementor;
-
-     public void setTrafficType(String type) {
-         this.trafficType = type;
-     }
-
-     public void setImplementor(String impl) {
-         this.implementor = impl;
-     }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/TrafficTypeResponse.java b/api/src/com/cloud/api/response/TrafficTypeResponse.java
deleted file mode 100644
index cca7f63..0000000
--- a/api/src/com/cloud/api/response/TrafficTypeResponse.java
+++ /dev/null
@@ -1,91 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class TrafficTypeResponse extends BaseResponse {
-
-    @SerializedName(ApiConstants.ID) @Param(description="id of the network provider")
-    private String id;
-
-    @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="the trafficType to be added to the physical network")
-    private String trafficType;
-
-    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
-    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
-
-    @SerializedName(ApiConstants.XEN_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a XenServer host")
-    private String xenNetworkLabel;
-
-    @SerializedName(ApiConstants.KVM_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a KVM host")
-    private String kvmNetworkLabel;
-
-    @SerializedName(ApiConstants.VMWARE_NETWORK_LABEL) @Param(description="The network name label of the physical device dedicated to this traffic on a VMware host")
-    private String vmwareNetworkLabel;
-
-    public void setPhysicalNetworkId(long physicalNetworkId) {
-        this.physicalNetworkId.setValue(physicalNetworkId);
-    }
-
-    public long getphysicalNetworkId() {
-        return physicalNetworkId.getValue();
-    }
-
-    public void setId(String uuid) {
-        this.id = uuid;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public String getTrafficType() {
-        return trafficType;
-    }
-
-    public void setTrafficType(String trafficType) {
-        this.trafficType = trafficType;
-    }
-
-    public String getXenLabel() {
-        return xenNetworkLabel;
-    }
-
-    public String getKvmLabel() {
-        return kvmNetworkLabel;
-    }
-
-    public void setXenLabel(String xenLabel) {
-        this.xenNetworkLabel = xenLabel;
-    }
-
-    public void setKvmLabel(String kvmLabel) {
-        this.kvmNetworkLabel = kvmLabel;
-    }
-
-    public void setVmwareLabel(String vmwareNetworkLabel) {
-        this.vmwareNetworkLabel = vmwareNetworkLabel;
-    }
-
-    public String getVmwareLabel() {
-        return vmwareNetworkLabel;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/UpgradeVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UpgradeVmResponse.java b/api/src/com/cloud/api/response/UpgradeVmResponse.java
deleted file mode 100644
index 079d1a5..0000000
--- a/api/src/com/cloud/api/response/UpgradeVmResponse.java
+++ /dev/null
@@ -1,297 +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 org.apache.cloudstack.api.ApiConstants;
-import com.cloud.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class UpgradeVmResponse extends BaseResponse {
-    @SerializedName("id")
-    private IdentityProxy id = new IdentityProxy("vm_instance");
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public Long getDomainId() {
-        return domainId.getValue();
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    public boolean isHaEnable() {
-        return haEnable;
-    }
-
-    public void setHaEnable(boolean haEnable) {
-        this.haEnable = haEnable;
-    }
-
-    public Long getZoneId() {
-        return zoneId.getValue();
-    }
-
-    public void setZoneId(Long zoneId) {
-        this.zoneId.setValue(zoneId);
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getZoneName() {
-        return zoneName;
-    }
-
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public Long getHostId() {
-        return hostId.getValue();
-    }
-
-    public void setHostId(Long hostId) {
-        this.hostId.setValue(hostId);
-    }
-
-    public String getHostName() {
-        return hostName;
-    }
-
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    public Long getTemplateId() {
-        return templateId.getValue();
-    }
-
-    public void setTemplateId(Long templateId) {
-        this.templateId.setValue(templateId);
-    }
-
-    public String getTemplateName() {
-        return templateName;
-    }
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    public String getTemplateDisplayText() {
-        return templateDisplayText;
-    }
-
-    public void setTemplateDisplayText(String templateDisplayText) {
-        this.templateDisplayText = templateDisplayText;
-    }
-
-    public boolean isPasswordEnabled() {
-        return passwordEnabled;
-    }
-
-    public void setPasswordEnabled(boolean passwordEnabled) {
-        this.passwordEnabled = passwordEnabled;
-    }
-
-    public Long getServiceOfferingId() {
-        return serviceOfferingId.getValue();
-    }
-
-    public void setServiceOfferingId(Long serviceOfferingId) {
-        this.serviceOfferingId.setValue(serviceOfferingId);
-    }
-
-    public String getServiceOfferingName() {
-        return serviceOfferingName;
-    }
-
-    public void setServiceOfferingName(String serviceOfferingName) {
-        this.serviceOfferingName = serviceOfferingName;
-    }
-
-    public long getCpuSpeed() {
-        return cpuSpeed;
-    }
-
-    public void setCpuSpeed(long cpuSpeed) {
-        this.cpuSpeed = cpuSpeed;
-    }
-
-    public long getMemory() {
-        return memory;
-    }
-
-    public void setMemory(long memory) {
-        this.memory = memory;
-    }
-
-    public long getCpuUsed() {
-        return cpuUsed;
-    }
-
-    public void setCpuUsed(long cpuUsed) {
-        this.cpuUsed = cpuUsed;
-    }
-
-    public long getNetworkKbsRead() {
-        return networkKbsRead;
-    }
-
-    public void setNetworkKbsRead(long networkKbsRead) {
-        this.networkKbsRead = networkKbsRead;
-    }
-
-    public long getNetworkKbsWrite() {
-        return networkKbsWrite;
-    }
-
-    public void setNetworkKbsWrite(long networkKbsWrite) {
-        this.networkKbsWrite = networkKbsWrite;
-    }
-
-    public Long isId() {
-        return id.getValue();
-    }
-
-    @SerializedName("name") @Param(description="the ID of the virtual machine")
-    private String name;
-
-    @SerializedName("created") @Param(description="the date when this virtual machine was created")
-    private Date created;
-
-    @SerializedName("ipaddress") @Param(description="the ip address of the virtual machine")
-    private String ipAddress;
-
-    @SerializedName("state") @Param(description="the state of the virtual machine")
-    private String state;
-
-    @SerializedName("account") @Param(description="the account associated with the virtual machine")
-    private String account;
-
-    @SerializedName("domainid") @Param(description="the ID of the domain in which the virtual machine exists")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName("domain") @Param(description="the name of the domain in which the virtual machine exists")
-    private String domain;
-
-    @SerializedName("haenable") @Param(description="true if high-availability is enabled, false otherwise")
-    private boolean haEnable;
-
-    @SerializedName("zoneid") @Param(description="the ID of the availablility zone for the virtual machine")
-    private IdentityProxy zoneId = new IdentityProxy("data_center");
-
-    @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.")
-    private String displayName;
-
-    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
-    private String zoneName;
-
-    @SerializedName("hostid") @Param(description="the ID of the host for the virtual machine")
-    private IdentityProxy hostId = new IdentityProxy("host");
-
-    @SerializedName("hostname") @Param(description="the name of the host for the virtual machine")
-    private String hostName;
-
-    @SerializedName("templateid") @Param(description="the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.")
-    private IdentityProxy templateId = new IdentityProxy("vm_template");
-
-    @SerializedName("templatename") @Param(description="the name of the template for the virtual machine")
-    private String templateName;
-
-    @SerializedName("templatedisplaytext") @Param(description=" an alternate display text of the template for the virtual machine")
-    private String templateDisplayText;
-
-    @SerializedName("passwordenabled") @Param(description="true if the password rest feature is enabled, false otherwise")
-    private boolean passwordEnabled;
-
-    @SerializedName("serviceofferingid") @Param(description="the ID of the service offering of the virtual machine")
-    private IdentityProxy serviceOfferingId = new IdentityProxy("disk_offering");
-
-    @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
-    private String serviceOfferingName;
-
-    @SerializedName("cpunumber") @Param(description="the number of cpu this virtual machine is running with")
-    private long cpuSpeed;
-
-    @SerializedName("memory")  @Param(description="the memory allocated for the virtual machine")
-    private long memory;
-
-    @SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
-    private long cpuUsed;
-
-    @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the vm")
-    private long networkKbsRead;
-
-    @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host")
-    private long networkKbsWrite;
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/com/cloud/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/response/UserResponse.java b/api/src/com/cloud/api/response/UserResponse.java
deleted file mode 100644
index 6ecede6..0000000
--- a/api/src/com/cloud/api/response/UserResponse.java
+++ /dev/null
@@ -1,190 +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.utils.IdentityProxy;
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
-
-public class UserResponse extends BaseResponse {
-    @SerializedName("id") @Param(description="the user ID")
-    private IdentityProxy id = new IdentityProxy("user");
-
-    @SerializedName("username") @Param(description="the user name")
-    private String username;
-
-    @SerializedName("firstname") @Param(description="the user firstname")
-    private String firstname;
-
-    @SerializedName("lastname") @Param(description="the user lastname")
-    private String lastname;
-
-    @SerializedName("email") @Param(description="the user email address")
-    private String email;
-
-    @SerializedName("created") @Param(description="the date and time the user account was created")
-    private Date created;
-
-    @SerializedName("state") @Param(description="the user state")
-    private String state;
-
-    @SerializedName("account") @Param(description="the account name of the user")
-    private String accountName;
-
-    @SerializedName("accounttype") @Param(description="the account type of the user")
-    private Short accountType;
-
-    @SerializedName("domainid") @Param(description="the domain ID of the user")
-    private IdentityProxy domainId = new IdentityProxy("domain");
-
-    @SerializedName("domain") @Param(description="the domain name of the user")
-    private String domainName;
-
-    @SerializedName("timezone") @Param(description="the timezone user was created in")
-    private String timezone;
-
-    @SerializedName("apikey") @Param(description="the api key of the user")
-    private String apiKey;
-
-    @SerializedName("secretkey") @Param(description="the secret key of the user")
-    private String secretKey;
-
-    @SerializedName("accountid") @Param(description="the account ID of the user")
-    private IdentityProxy accountId = new IdentityProxy("account");
-
-
-    public Long getId() {
-        return id.getValue();
-    }
-
-    public void setId(Long id) {
-        this.id.setValue(id);
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getFirstname() {
-        return firstname;
-    }
-
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
-
-    public String getLastname() {
-        return lastname;
-    }
-
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public Short getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(Short accountType) {
-        this.accountType = accountType;
-    }
-
-    public Long getDomainId() {
-        return domainId.getValue();
-    }
-
-    public void setDomainId(Long domainId) {
-        this.domainId.setValue(domainId);
-    }
-
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public void setDomainName(String domainName) {
-        this.domainName = domainName;
-    }
-
-    public String getTimezone() {
-        return timezone;
-    }
-
-    public void setTimezone(String timezone) {
-        this.timezone = timezone;
-    }
-
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-    }
-    public Long getAccountId() {
-        return accountId.getValue();
-    }
-
-    public void setAccountId(Long accountId) {
-        this.accountId.setValue(accountId);
-    }
-}