You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/06/19 00:29:42 UTC
git commit: updated refs/heads/master-6-17-stable to b0f241d
Updated Branches:
refs/heads/master-6-17-stable d37cc9b60 -> b0f241dfd
CLOUDSTACK-3016: remove zonetype property from API response (userVM)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0f241df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0f241df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0f241df
Branch: refs/heads/master-6-17-stable
Commit: b0f241dfd286843038d39a40cac8cb23c6c58efb
Parents: d37cc9b
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jun 18 15:23:02 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Jun 18 15:23:02 2013 -0700
----------------------------------------------------------------------
.../apache/cloudstack/api/response/UserVmResponse.java | 7 -------
.../src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 -
server/src/com/cloud/api/query/vo/UserVmJoinVO.java | 13 -------------
3 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0f241df/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
index 1f9eb1a..5b71ba2 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -80,9 +80,6 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
@SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine")
private String zoneName;
- @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the network type of the availability zone for the virtual machine")
- private String zoneType;
-
@SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine")
private String hostId;
@@ -273,10 +270,6 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
this.zoneName = zoneName;
}
- public void setZoneType(String zoneType) {
- this.zoneType = zoneType;
- }
-
public void setHostId(String hostId) {
this.hostId = hostId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0f241df/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index dbfe94d..4c41018 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -102,7 +102,6 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
}
userVmResponse.setZoneId(userVm.getDataCenterUuid());
userVmResponse.setZoneName(userVm.getDataCenterName());
- userVmResponse.setZoneType(userVm.getDataCenterType());
if ((caller == null) || (caller.getType() == Account.ACCOUNT_TYPE_ADMIN)) {
userVmResponse.setInstanceName(userVm.getInstanceName());
userVmResponse.setHostId(userVm.getHostUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0f241df/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index 8ad0fdd..c97d71a 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -156,9 +156,6 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
@Column(name="data_center_name")
private String dataCenterName = null;
- @Column(name="data_center_type")
- private String dataCenterType = null;
-
@Column(name="security_group_enabled")
private boolean securityGroupEnabled;
@@ -813,17 +810,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
public void setDataCenterName(String zoneName) {
this.dataCenterName = zoneName;
}
-
-
- public String getDataCenterType() {
- return dataCenterType;
- }
-
- public void setDataCenterType(String zoneType) {
- this.dataCenterType = zoneType;
- }
-
public boolean isSecurityGroupEnabled() {
return securityGroupEnabled;