cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 759eeca
Date Tue, 18 Jun 2013 21:43:43 GMT
Updated Branches:
  refs/heads/master 0a8343e75 -> 759eeca65


CLOUDSTACK-3016: remove zonetype property from API response (snapshot, ISO, template, network,
volume)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/759eeca6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/759eeca6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/759eeca6

Branch: refs/heads/master
Commit: 759eeca6518aebf4db8536f8c40ba94e982a2b7c
Parents: 0a8343e
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jun 18 14:42:38 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jun 18 14:42:38 2013 -0700

----------------------------------------------------------------------
 .../cloudstack/api/response/NetworkResponse.java   |  7 -------
 .../cloudstack/api/response/SnapshotResponse.java  | 17 +----------------
 .../cloudstack/api/response/TemplateResponse.java  |  7 -------
 .../cloudstack/api/response/VolumeResponse.java    |  8 --------
 server/src/com/cloud/api/ApiResponseHelper.java    | 10 ----------
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |  3 +--
 .../src/com/cloud/api/query/vo/VolumeJoinVO.java   | 15 ---------------
 7 files changed, 2 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
index 70c3d79..3102433 100644
--- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -66,9 +66,6 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
 
     @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the
network belongs to")
     private String zoneName;
-    
-    @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the networktype of the zone
the network belongs to")
-    private String zoneType;
 
     @SerializedName("networkofferingid") @Param(description="network offering id the network
is created from")
     private String networkOfferingId;
@@ -309,10 +306,6 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
         this.zoneName = zoneName;
     }
 
-    public void setZoneType(String zoneType) {
-        this.zoneType = zoneType;
-    }
-    
     public void setCidr(String cidr) {
         this.cidr = cidr;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
index ca74a18..e9cb109 100644
--- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java
@@ -97,14 +97,6 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     @Param(description = "id of the availability zone")
     private String zoneId;
 
-    @SerializedName(ApiConstants.ZONE_NAME)
-    @Param(description = "name of the availability zone")
-    private String zoneName;
-    
-    @SerializedName(ApiConstants.ZONE_TYPE)
-    @Param(description = "network type of the availability zone")
-    private String zoneType;
-    
     @SerializedName(ApiConstants.TAGS)  @Param(description="the list of resource tags associated
with snapshot", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
 
@@ -188,14 +180,7 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe
     public void setZoneId(String zoneId) {
         this.zoneId = zoneId;
     }
-    public void setZoneName(String zoneName) {
-        this.zoneName = zoneName;
-    }
-
-    public void setZoneType(String zoneType) {
-        this.zoneType = zoneType;
-    }
-    
+ 
     public void setTags(List<ResourceTagResponse> tags) {
         this.tags = tags;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/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
index 896154a..ed933ff 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -87,9 +87,6 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
 
     @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone for
this template")
     private String zoneName;
-    
-    @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the networktype of the zone
for this template")
-    private String zoneType;
 
     @SerializedName(ApiConstants.STATUS) @Param(description="the status of the template")
     private String status;
@@ -159,10 +156,6 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe
         this.zoneName = zoneName;
     }
 
-    public void setZoneType(String zoneType) {
-        this.zoneType = zoneType;
-    }
-    
     public void setAccountId(String accountId) {
         this.accountId = accountId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index e3463bd..b643de1 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -47,10 +47,6 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
     @SerializedName(ApiConstants.ZONE_NAME)
     @Param(description = "name of the availability zone")
     private String zoneName;
-    
-    @SerializedName(ApiConstants.ZONE_TYPE)
-    @Param(description = "network type of the availability zone")
-    private String zoneType;
 
     @SerializedName(ApiConstants.TYPE)
     @Param(description = "type of the disk volume (ROOT or DATADISK)")
@@ -217,10 +213,6 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity
         this.zoneName = zoneName;
     }
 
-    public void setZoneType(String zoneType) {
-        this.zoneType = zoneType;
-    }
-    
     public void setVolumeType(String volumeType) {
         this.volumeType = volumeType;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 82b08f7..7ffa30f 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -435,13 +435,6 @@ public class ApiResponseHelper implements ResponseGenerator {
             snapshotResponse.setVolumeId(volume.getUuid());
             snapshotResponse.setVolumeName(volume.getName());
             snapshotResponse.setVolumeType(volume.getVolumeType().name());
-        
-            DataCenter zone = ApiDBUtils.findZoneById(volume.getDataCenterId());
-            if (zone != null) {
-            	snapshotResponse.setZoneName(zone.getName());
-            	snapshotResponse.setZoneType(zone.getNetworkType().toString());
-                snapshotResponse.setZoneId(zone.getUuid());
-            }
         }
         snapshotResponse.setCreated(snapshot.getCreated());
         snapshotResponse.setName(snapshot.getName());
@@ -1462,7 +1455,6 @@ public class ApiResponseHelper implements ResponseGenerator {
             // Add the zone ID
             templateResponse.setZoneId(datacenter.getUuid());
             templateResponse.setZoneName(datacenter.getName());
-            templateResponse.setZoneType(datacenter.getNetworkType().toString());
         }
 
         boolean isAdmin = false;
@@ -1751,7 +1743,6 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (datacenter != null) {
             isoResponse.setZoneId(datacenter.getUuid());
             isoResponse.setZoneName(datacenter.getName());
-            isoResponse.setZoneType(datacenter.getNetworkType().toString());
         }
 
         // If the user is an admin, add the template download status
@@ -2239,7 +2230,6 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (zone != null) {
             response.setZoneId(zone.getUuid());
             response.setZoneName(zone.getName());
-            response.setZoneType(zone.getNetworkType().toString());
         }
         if (network.getPhysicalNetworkId() != null) {
             PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(network.getPhysicalNetworkId());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 453e82e..ed2732e 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -86,8 +86,7 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long>
implem
 
         volResponse.setZoneId(volume.getDataCenterUuid());
         volResponse.setZoneName(volume.getDataCenterName());
-        volResponse.setZoneType(volume.getDataCenterType());
-        
+
         volResponse.setVolumeType(volume.getVolumeType().toString());
         volResponse.setDeviceId(volume.getDeviceId());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/759eeca6/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
index 735cf9a..1f07f52 100644
--- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
@@ -117,9 +117,6 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity
{
 
     @Column(name="data_center_name")
     private String dataCenterName;
-    
-    @Column(name="data_center_type")
-    private String dataCenterType;
 
     @Column(name="vm_id")
     private long vmId;
@@ -1060,20 +1057,8 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity
{
         this.dataCenterName = dataCenterName;
     }
 
-       
-        
-    public String getDataCenterType() {
-        return dataCenterType;
-    }
-
 
 
-    public void setDataCenterType(String dataCenterType) {
-        this.dataCenterType = dataCenterType;
-    }
-    
-    
-
     public long getPodId() {
         return podId;
     }


Mime
View raw message