You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2015/09/19 03:31:39 UTC
[33/50] git commit: updated refs/heads/sf-plugins to 157efc3
Return the account name and the zone name and make use of the account name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9cff6a78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9cff6a78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9cff6a78
Branch: refs/heads/sf-plugins
Commit: 9cff6a78568a77a0e9955ae9dfb860f66d860a5d
Parents: d8154cc
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Mon Jul 20 23:12:02 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Sep 18 19:28:22 2015 -0600
----------------------------------------------------------------------
.../apache/cloudstack/api/helper/ApiHelper.java | 2 ++
.../ApiSolidFireVirtualNetworkResponse.java | 24 ++++++++++++++++++++
ui/plugins/sfAdministration/sfAdministration.js | 2 +-
3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cff6a78/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java b/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java
index b042499..c93040e 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/helper/ApiHelper.java
@@ -127,6 +127,7 @@ public class ApiHelper {
Account account = _accountDao.findById(sfVirtualNetwork.getAccountId());
sfResponse.setAccountUuid(account.getUuid());
+ sfResponse.setAccountName(account.getAccountName());
SfCluster sfCluster = _sfClusterDao.findById(sfVirtualNetwork.getSfClusterId());
@@ -135,6 +136,7 @@ public class ApiHelper {
DataCenterVO dataCenterVO = _zoneDao.findById(sfCluster.getZoneId());
sfResponse.setZoneUuid(dataCenterVO.getUuid());
+ sfResponse.setZoneName(dataCenterVO.getName());
if (ResponseView.Full.equals(responseView)) {
sfResponse.setTag(sfVirtualNetwork.getTag());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cff6a78/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireVirtualNetworkResponse.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireVirtualNetworkResponse.java b/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireVirtualNetworkResponse.java
index 2764019..0001825 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireVirtualNetworkResponse.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/response/ApiSolidFireVirtualNetworkResponse.java
@@ -67,6 +67,10 @@ public class ApiSolidFireVirtualNetworkResponse extends BaseResponse {
@Param(description = "UUID of the account the VLAN is associated with")
private String _accountUuid;
+ @SerializedName("accountname")
+ @Param(description = "Name of the account the volume is associated with")
+ private String _accountName;
+
@SerializedName("zoneid")
@Param(description = "ID of the zone the VLAN is associated with")
private long _zoneId;
@@ -75,6 +79,10 @@ public class ApiSolidFireVirtualNetworkResponse extends BaseResponse {
@Param(description = "UUID of the zone the VLAN is associated with")
private String _zoneUuid;
+ @SerializedName("zonename")
+ @Param(description = "Name of the zone the volume is associated with")
+ private String _zoneName;
+
@SerializedName("clustername")
@Param(description = "Name of cluster the VLAN belongs to")
private String _clusterName;
@@ -159,6 +167,14 @@ public class ApiSolidFireVirtualNetworkResponse extends BaseResponse {
return _accountUuid;
}
+ public void setAccountName(String accountName) {
+ _accountName = accountName;
+ }
+
+ public String getAccountName() {
+ return _accountName;
+ }
+
public void setZoneId(long zoneId) {
_zoneId = zoneId;
}
@@ -175,6 +191,14 @@ public class ApiSolidFireVirtualNetworkResponse extends BaseResponse {
return _zoneUuid;
}
+ public void setZoneName(String zoneName) {
+ _zoneName = zoneName;
+ }
+
+ public String getZoneName() {
+ return _zoneName;
+ }
+
public void setClusterName(String clusterName) {
_clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cff6a78/ui/plugins/sfAdministration/sfAdministration.js
----------------------------------------------------------------------
diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js
index 46ac7f2..7afeeda 100644
--- a/ui/plugins/sfAdministration/sfAdministration.js
+++ b/ui/plugins/sfAdministration/sfAdministration.js
@@ -307,7 +307,7 @@
name: { label: 'label.name' },
tag: { label: 'Tag' },
svip: { label: 'SVIP' },
- account: { label: 'label.account' }
+ accountname: { label: 'label.account' }
},
dataProvider: function(args) {
var clustername = args.context.sfAdministration[0].name;