cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject [1/2] git commit: updated refs/heads/sf-plugins to f812e10
Date Tue, 28 Jul 2015 21:34:16 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/sf-plugins bcf1c72c8 -> f812e10bb


The VLAN tag cannot be changed

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

Branch: refs/heads/sf-plugins
Commit: 4673447e6eb36275b8bbeb942d13ff406975f7bd
Parents: bcf1c72
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Tue Jul 28 15:10:02 2015 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Tue Jul 28 15:10:02 2015 -0600

----------------------------------------------------------------------
 .../solidfire/UpdateSolidFireVirtualNetworkCmd.java     |  5 +----
 .../cloudstack/solidfire/ApiSolidFireService2.java      |  3 +--
 .../cloudstack/solidfire/ApiSolidFireServiceImpl2.java  |  7 +++----
 .../cloudstack/solidfire/util/SolidFireConnection.java  | 12 +++++-------
 ui/plugins/sfAdministration/sfAdministration.js         |  4 +---
 5 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4673447e/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java
b/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java
index 210b640..2d71947 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/api/command/admin/solidfire/UpdateSolidFireVirtualNetworkCmd.java
@@ -47,9 +47,6 @@ public class UpdateSolidFireVirtualNetworkCmd extends BaseCmd {
     @Parameter(name = ApiHelper.NAME, type = CommandType.STRING, description = ApiHelper.VIRTUAL_NETWORK_NAME_DESC,
required = true)
     private String _name;
 
-    @Parameter(name = ApiHelper.TAG, type = CommandType.STRING, description = ApiHelper.VIRTUAL_NETWORK_TAG_DESC,
required = true)
-    private String _tag;
-
     @Parameter(name = ApiHelper.START_IP, type = CommandType.STRING, description = ApiHelper.START_IP_ADDRESS_DESC,
required = true)
     private String _startIp;
 
@@ -90,7 +87,7 @@ public class UpdateSolidFireVirtualNetworkCmd extends BaseCmd {
         try {
             s_logger.info(UpdateSolidFireVirtualNetworkCmd.class.getName() + ".execute invoked");
 
-            SfVirtualNetwork sfVirtualNetwork = _apiSolidFireService2.updateSolidFireVirtualNetwork(_id,
_name, _tag, _startIp, _size, _netmask, _svip);
+            SfVirtualNetwork sfVirtualNetwork = _apiSolidFireService2.updateSolidFireVirtualNetwork(_id,
_name, _startIp, _size, _netmask, _svip);
 
             ApiSolidFireVirtualNetworkResponse response = _apiHelper.getApiSolidFireVirtualNetworkResponse(sfVirtualNetwork,
ResponseView.Full);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4673447e/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java
b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java
index e6ed7d2..12f276c 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireService2.java
@@ -53,8 +53,7 @@ public interface ApiSolidFireService2 extends PluggableService, Configurable
{
     SfVirtualNetwork createSolidFireVirtualNetwork(String clusterName, String name, String
tag, String startIp, int size,
             String netmask, String svip, long accountId);
 
-    SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String tag, String
startIp, int size,
-            String netmask, String svip);
+    SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp,
int size, String netmask, String svip);
 
     SfVirtualNetwork deleteSolidFireVirtualNetwork(long id);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4673447e/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
index ff11202..9137c07 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java
@@ -332,8 +332,7 @@ public class ApiSolidFireServiceImpl2 extends AdapterBase implements APIChecker,
     }
 
     @Override
-    public SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String tag,
String startIp, int size,
-            String netmask, String svip) {
+    public SfVirtualNetwork updateSolidFireVirtualNetwork(long id, String name, String startIp,
int size, String netmask, String svip) {
         s_logger.info("updateSolidFireVirtualNetwork invoked");
 
         verifyRootAdmin();
@@ -346,10 +345,10 @@ public class ApiSolidFireServiceImpl2 extends AdapterBase implements
APIChecker,
 
         SolidFireConnection sfConnection = new SolidFireConnection(sfClusterVO.getMvip(),
sfClusterVO.getUsername(), sfClusterVO.getPassword());
 
-        sfConnection.modifyVirtualNetwork(sfVirtualNetworkVO.getSfId(), name, tag, startIp,
size, netmask, svip);
+        sfConnection.modifyVirtualNetwork(name, sfVirtualNetworkVO.getTag(), startIp, size,
netmask, svip);
 
         sfVirtualNetworkVO.setName(name);
-        sfVirtualNetworkVO.setTag(tag);
+        sfVirtualNetworkVO.setTag(sfVirtualNetworkVO.getTag());
         sfVirtualNetworkVO.setStartIp(startIp);
         sfVirtualNetworkVO.setSize(size);
         sfVirtualNetworkVO.setNetmask(netmask);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4673447e/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java
b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java
index 813f6e2..f00a84b 100644
--- a/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java
+++ b/plugins/api/solidfire/src/org/apache/cloudstack/solidfire/util/SolidFireConnection.java
@@ -95,10 +95,10 @@ public class SolidFireConnection {
         return virtualNetworkAddResult.result.virtualNetworkID;
     }
 
-    public void modifyVirtualNetwork(long id, String name, String tag, String startIp, int
size, String netmask, String svip) {
+    public void modifyVirtualNetwork(String name, String tag, String startIp, int size, String
netmask, String svip) {
         final Gson gson = new GsonBuilder().create();
 
-        VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(id, name,
tag, startIp, size, netmask, svip);
+        VirtualNetworkToModify virtualNetworkToModify = new VirtualNetworkToModify(name,
tag, startIp, size, netmask, svip);
 
         String strVirtualNetworkToModifyJson = gson.toJson(virtualNetworkToModify);
 
@@ -428,20 +428,18 @@ public class SolidFireConnection {
         private final String method = "ModifyVirtualNetwork";
         private final VirtualNetworkToModifyParams params;
 
-        public VirtualNetworkToModify(long id, String name, String tag, String startIp, int
size, String netmask, String svip) {
-            params = new VirtualNetworkToModifyParams(id, name, tag, startIp, size, netmask,
svip);
+        public VirtualNetworkToModify(String name, String tag, String startIp, int size,
String netmask, String svip) {
+            params = new VirtualNetworkToModifyParams(name, tag, startIp, size, netmask,
svip);
         }
 
         private static final class VirtualNetworkToModifyParams {
-            private final long virtualNetworkID;
             private final String name;
             private final String virtualNetworkTag;
             private final AddressBlock[] addressBlocks = new AddressBlock[1];
             private final String netmask;
             private final String svip;
 
-            public VirtualNetworkToModifyParams(long id, String name, String tag, String
startIp, int size, String netmask, String svip) {
-                this.virtualNetworkID = id;
+            public VirtualNetworkToModifyParams(String name, String tag, String startIp,
int size, String netmask, String svip) {
                 this.name = name;
                 this.virtualNetworkTag = tag;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4673447e/ui/plugins/sfAdministration/sfAdministration.js
----------------------------------------------------------------------
diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js
index a5945a0..9fabf58 100644
--- a/ui/plugins/sfAdministration/sfAdministration.js
+++ b/ui/plugins/sfAdministration/sfAdministration.js
@@ -460,7 +460,6 @@
 
                     params.push("&id=" + args.context.sfVirtualNetworks[0].id);
                     params.push("&name=" + args.data.name);
-                    params.push("&tag=" + args.data.tag);
                     params.push("&netmask=" + args.data.netmask);
                     params.push("&startip=" + args.data.startip);
                     params.push("&size=" + args.data.size);
@@ -525,8 +524,7 @@
                         label: 'label.account'
                       },
                       tag: {
-                        label: 'Tag',
-                        isEditable: true
+                        label: 'Tag'
                       },
                       netmask: {
                         label: 'Netmask',


Mime
View raw message