cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [18/57] api: Refactor command and response classes to org.apache.cloudstack.api.*
Date Sat, 08 Dec 2012 03:29:51 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
new file mode 100644
index 0000000..64174eb
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -0,0 +1,221 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/SuccessResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SuccessResponse.java b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
new file mode 100644
index 0000000..47c65b6
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java
@@ -0,0 +1,51 @@
+// 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 org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/SwiftResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SwiftResponse.java b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
new file mode 100644
index 0000000..f3c219f
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java
@@ -0,0 +1,90 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
new file mode 100644
index 0000000..5ede9f3
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java
@@ -0,0 +1,99 @@
+// 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 org.apache.cloudstack.api.response;
+
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+/*
+ * 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/org/apache/cloudstack/api/response/SystemVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
new file mode 100644
index 0000000..cc1f5ae
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -0,0 +1,318 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
new file mode 100644
index 0000000..59e82d3
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java
@@ -0,0 +1,64 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+@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/org/apache/cloudstack/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
new file mode 100644
index 0000000..2cea0f6
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -0,0 +1,289 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+@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/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
new file mode 100644
index 0000000..30adc3d
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java
@@ -0,0 +1,38 @@
+// 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 org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
new file mode 100644
index 0000000..d32e580
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -0,0 +1,92 @@
+// 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 org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/UpgradeVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
new file mode 100644
index 0000000..0bc22dc
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java
@@ -0,0 +1,298 @@
+// 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 org.apache.cloudstack.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;
+import org.apache.cloudstack.api.BaseResponse;
+
+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/org/apache/cloudstack/api/response/UserResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java
new file mode 100644
index 0000000..2868be4
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java
@@ -0,0 +1,191 @@
+// 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 org.apache.cloudstack.api.response;
+
+import java.util.Date;
+
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+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);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
new file mode 100644
index 0000000..4934d8b
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -0,0 +1,393 @@
+// 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 org.apache.cloudstack.api.response;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.Entity;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("unused")
+@Entity(value = VirtualMachine.class)
+public class UserVmResponse extends BaseResponse implements ControlledEntityResponse {
+    @SerializedName(ApiConstants.ID) @Param(description="the ID of the virtual machine")
+    private String id;
+
+    @SerializedName(ApiConstants.NAME) @Param(description="the name of the virtual machine")
+    private String name;
+
+    @SerializedName("displayname") @Param(description="user generated name. The name of the virtual machine is returned if no displayname exists.")
+    private String displayName;
+
+    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the virtual machine")
+    private String accountName;
+
+    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vm")
+    private String projectId;
+
+    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vm")
+    private String projectName;
+
+    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the ID of the domain in which the virtual machine exists")
+    private String domainId;
+
+    @SerializedName(ApiConstants.DOMAIN) @Param(description="the name of the domain in which the virtual machine exists")
+    private String domainName;
+
+    @SerializedName(ApiConstants.CREATED) @Param(description="the date when this virtual machine was created")
+    private Date created;
+
+    @SerializedName(ApiConstants.STATE) @Param(description="the state of the virtual machine")
+    private String state;
+
+    @SerializedName(ApiConstants.HA_ENABLE) @Param(description="true if high-availability is enabled, false otherwise")
+    private Boolean haEnable;
+
+    @SerializedName(ApiConstants.GROUP_ID) @Param(description="the group ID of the virtual machine")
+    private String groupId;
+
+    @SerializedName(ApiConstants.GROUP) @Param(description="the group name of the virtual machine")
+    private String group;
+
+    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the ID of the availablility zone for the virtual machine")
+    private String zoneId;
+
+    @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
+    private String zoneName;
+
+    @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine")
+    private String hostId;
+
+    @SerializedName("hostname") @Param(description="the name of the host for the virtual machine")
+    private String hostName;
+
+    @SerializedName(ApiConstants.TEMPLATE_ID) @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 String templateId;
+
+    @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(ApiConstants.PASSWORD_ENABLED) @Param(description="true if the password rest feature is enabled, false otherwise")
+    private Boolean passwordEnabled;
+
+    @SerializedName("isoid") @Param(description="the ID of the ISO attached to the virtual machine")
+    private String isoId;
+
+    @SerializedName("isoname") @Param(description="the name of the ISO attached to the virtual machine")
+    private String isoName;
+
+    @SerializedName("isodisplaytext") @Param(description="an alternate display text of the ISO attached to the virtual machine")
+    private String isoDisplayText;
+
+    @SerializedName(ApiConstants.SERVICE_OFFERING_ID) @Param(description="the ID of the service offering of the virtual machine")
+    private String serviceOfferingId;
+
+    @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
+    private String serviceOfferingName;
+
+    @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the service offering")
+    private Boolean forVirtualNetwork;
+
+    @SerializedName(ApiConstants.CPU_NUMBER) @Param(description="the number of cpu this virtual machine is running with")
+    private Integer cpuNumber;
+
+    @SerializedName(ApiConstants.CPU_SPEED) @Param(description="the speed of each cpu")
+    private Integer cpuSpeed;
+
+    @SerializedName(ApiConstants.MEMORY) @Param(description="the memory allocated for the virtual machine")
+    private Integer memory;
+
+    @SerializedName("cpuused") @Param(description="the amount of the vm's CPU currently used")
+    private String 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;
+
+    @SerializedName("guestosid") @Param(description="Os type ID of the virtual machine")
+    private String guestOsId;
+
+    @SerializedName("rootdeviceid") @Param(description="device ID of the root volume")
+    private Long rootDeviceId;
+
+    @SerializedName("rootdevicetype") @Param(description="device type of the root volume")
+    private String rootDeviceType;
+
+    @SerializedName("securitygroup") @Param(description="list of security groups associated with the virtual machine", responseObject = SecurityGroupResponse.class)
+    private Set<SecurityGroupResponse> securityGroupList;
+
+    @SerializedName(ApiConstants.PASSWORD) @Param(description="the password (if exists) of the virtual machine")
+    private String password;
+
+    @SerializedName("nic")  @Param(description="the list of nics associated with vm", responseObject = NicResponse.class)
+    private Set<NicResponse> nics;
+
+    @SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs")
+    private String hypervisor;
+
+    @SerializedName(ApiConstants.PUBLIC_IP_ID) @Param(description="public IP address id associated with vm via Static nat rule")
+    private String publicIpId;
+
+    @SerializedName(ApiConstants.PUBLIC_IP) @Param(description="public IP address id associated with vm via Static nat rule")
+    private String publicIp;
+
+    @SerializedName(ApiConstants.INSTANCE_NAME) @Param(description="instance name of the user vm; this parameter is returned to the ROOT admin only", since="3.0.1")
+    private String instanceName;
+
+    @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated with vm", responseObject = ResourceTagResponse.class)
+    private Set<ResourceTagResponse> tags;
+
+    @SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair")
+    private String keyPairName;
+
+    public UserVmResponse(){
+        securityGroupList = new HashSet<SecurityGroupResponse>();
+        nics = new HashSet<NicResponse>();
+        tags = new HashSet<ResourceTagResponse>();
+    }
+
+    public void setHypervisor(String hypervisor) {
+        this.hypervisor = hypervisor;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    @Override
+    public String getObjectUuid() {
+        return this.getId();
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+
+    public void setDomainName(String domainName) {
+        this.domainName = domainName;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public void setHaEnable(Boolean haEnable) {
+        this.haEnable = haEnable;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    public void setZoneId(String zoneId) {
+        this.zoneId = zoneId;
+    }
+
+    public void setZoneName(String zoneName) {
+        this.zoneName = zoneName;
+    }
+
+    public void setHostId(String hostId) {
+        this.hostId = hostId;
+    }
+
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public void setTemplateDisplayText(String templateDisplayText) {
+        this.templateDisplayText = templateDisplayText;
+    }
+
+    public void setPasswordEnabled(Boolean passwordEnabled) {
+        this.passwordEnabled = passwordEnabled;
+    }
+
+    public void setIsoId(String isoId) {
+        this.isoId = isoId;
+    }
+
+    public void setIsoName(String isoName) {
+        this.isoName = isoName;
+    }
+
+    public void setIsoDisplayText(String isoDisplayText) {
+        this.isoDisplayText = isoDisplayText;
+    }
+
+    public void setServiceOfferingId(String serviceOfferingId) {
+        this.serviceOfferingId = serviceOfferingId;
+    }
+
+    public void setServiceOfferingName(String serviceOfferingName) {
+        this.serviceOfferingName = serviceOfferingName;
+    }
+
+    public void setCpuNumber(Integer cpuNumber) {
+        this.cpuNumber = cpuNumber;
+    }
+
+    public void setCpuSpeed(Integer cpuSpeed) {
+        this.cpuSpeed = cpuSpeed;
+    }
+
+    public void setMemory(Integer memory) {
+        this.memory = memory;
+    }
+
+    public void setCpuUsed(String cpuUsed) {
+        this.cpuUsed = cpuUsed;
+    }
+
+    public void setNetworkKbsRead(Long networkKbsRead) {
+        this.networkKbsRead = networkKbsRead;
+    }
+
+    public void setNetworkKbsWrite(Long networkKbsWrite) {
+        this.networkKbsWrite = networkKbsWrite;
+    }
+
+    public void setGuestOsId(String guestOsId) {
+        this.guestOsId = guestOsId;
+    }
+
+    public void setRootDeviceId(Long rootDeviceId) {
+        this.rootDeviceId = rootDeviceId;
+    }
+
+    public void setRootDeviceType(String rootDeviceType) {
+        this.rootDeviceType = rootDeviceType;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setForVirtualNetwork(Boolean forVirtualNetwork) {
+        this.forVirtualNetwork = forVirtualNetwork;
+    }
+
+    public void setNics(Set<NicResponse> nics) {
+        this.nics = nics;
+    }
+
+    public void addNic(NicResponse nic) {
+        this.nics.add(nic);
+    }
+
+    public void setSecurityGroupList(Set<SecurityGroupResponse> securityGroups) {
+        this.securityGroupList = securityGroups;
+    }
+
+    public void addSecurityGroup(SecurityGroupResponse securityGroup){
+        this.securityGroupList.add(securityGroup);
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    @Override
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public void setPublicIpId(String publicIpId) {
+        this.publicIpId = publicIpId;
+    }
+
+    public void setPublicIp(String publicIp) {
+        this.publicIp = publicIp;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    public void setTags(Set<ResourceTagResponse> tags) {
+        this.tags = tags;
+    }
+
+    public void addTag(ResourceTagResponse tag){
+        this.tags.add(tag);
+    }
+
+    public void setKeyPairName(String keyPairName) {
+        this.keyPairName = keyPairName;
+    }
+
+    @Override
+    public void setProjectId(Long projectId) {
+        // TODO: remove this later
+    }
+
+    @Override
+    public void setDomainId(Long domainId) {
+        // TODO: remove this later
+    }
+
+    public void setProjectUuid(String projectUuid){
+        this.projectId = projectUuid;
+    }
+
+    public void setDomainUuid(String domainUuid){
+        this.domainId = domainUuid;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
new file mode 100644
index 0000000..85e7f11
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java
@@ -0,0 +1,86 @@
+// 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 org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse {
+    @SerializedName(ApiConstants.ID) @Param(description="the id of the router")
+    private IdentityProxy id = new IdentityProxy("virtual_router_providers");
+
+    @SerializedName(ApiConstants.NSP_ID) @Param(description="the physical network service provider id of the provider")
+    private IdentityProxy nspId = new IdentityProxy("physical_network_service_providers");
+
+    @SerializedName(ApiConstants.ENABLED) @Param(description="Enabled/Disabled the service provider")
+    private Boolean enabled;
+
+    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account associated with the provider")
+    private String accountName;
+
+    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the ipaddress")
+    private Long projectId;
+
+    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the address")
+    private String projectName;
+
+    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID associated with the provider")
+    private Long domainId;
+
+    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain associated with the provider")
+    private String domainName;
+
+    @Override
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
+    @Override
+    public void setDomainId(Long domainId) {
+        this.domainId = domainId;
+    }
+
+    @Override
+    public void setDomainName(String domainName) {
+        this.domainName = domainName;
+    }
+
+    @Override
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    @Override
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public void setNspId(Long nspId) {
+        this.nspId.setValue(nspId);
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e398b1e4/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
new file mode 100644
index 0000000..4993cc3
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java
@@ -0,0 +1,158 @@
+// 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 org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.utils.IdentityProxy;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+@SuppressWarnings("unused")
+public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse{
+    @SerializedName(ApiConstants.ID) @Param(description="the ID of the VLAN IP range")
+    private IdentityProxy id = new IdentityProxy("vlan");
+
+    @SerializedName("forvirtualnetwork") @Param(description="the virtual network for the VLAN IP range")
+    private Boolean forVirtualNetwork;
+
+    @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the VLAN IP range")
+    private IdentityProxy zoneId = new IdentityProxy("data_center");
+
+    @SerializedName(ApiConstants.VLAN) @Param(description="the ID or VID of the VLAN.")
+    private String vlan;
+
+    @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account of the VLAN IP range")
+    private String accountName;
+
+    @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the VLAN IP range")
+    private IdentityProxy domainId = new IdentityProxy("domain");
+
+    @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the VLAN IP range")
+    private String domainName;
+
+    @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID for the VLAN IP range")
+    private IdentityProxy podId = new IdentityProxy("host_pod_ref");
+
+    @SerializedName("podname") @Param(description="the Pod name for the VLAN IP range")
+    private String podName;
+
+    @SerializedName(ApiConstants.GATEWAY) @Param(description="the gateway of the VLAN IP range")
+    private String gateway;
+
+    @SerializedName(ApiConstants.NETMASK) @Param(description="the netmask of the VLAN IP range")
+    private String netmask;
+
+    @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the VLAN IP range")
+    private String description;
+
+    @SerializedName(ApiConstants.START_IP) @Param(description="the start ip of the VLAN IP range")
+    private String startIp;
+
+    @SerializedName(ApiConstants.END_IP) @Param(description="the end ip of the VLAN IP range")
+    private String endIp;
+
+    @SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network id of vlan range")
+    private IdentityProxy networkId = new IdentityProxy("networks");
+
+    @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vlan range")
+    private IdentityProxy projectId = new IdentityProxy("projects");
+
+    @SerializedName(ApiConstants.PROJECT) @Param(description="the project name of the vlan range")
+    private String projectName;
+
+    @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network this belongs to")
+    private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network");
+
+    public void setId(Long id) {
+        this.id.setValue(id);
+    }
+
+    public void setForVirtualNetwork(Boolean forVirtualNetwork) {
+        this.forVirtualNetwork = forVirtualNetwork;
+    }
+
+    public void setZoneId(Long zoneId) {
+        this.zoneId.setValue(zoneId);
+    }
+
+    public void setVlan(String vlan) {
+        this.vlan = vlan;
+    }
+
+    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 setPodId(Long podId) {
+        this.podId.setValue(podId);
+    }
+
+    public void setPodName(String podName) {
+        this.podName = podName;
+    }
+
+    public void setGateway(String gateway) {
+        this.gateway = gateway;
+    }
+
+    public void setNetmask(String netmask) {
+        this.netmask = netmask;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setStartIp(String startIp) {
+        this.startIp = startIp;
+    }
+
+    public void setEndIp(String endIp) {
+        this.endIp = endIp;
+    }
+
+    public void setNetworkId(Long networkId) {
+        this.networkId.setValue(networkId);
+    }
+
+    @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 long getphysicalNetworkId() {
+        return physicalNetworkId.getValue();
+    }
+}


Mime
View raw message