cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [1/2] git commit: updated refs/heads/4.3 to ea442fa
Date Tue, 24 Dec 2013 12:49:27 GMT
Updated Branches:
  refs/heads/4.3 289c8a09e -> ea442fa81
  refs/heads/master e659751a8 -> 435aefec1


CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be
applied when VR is upgraded


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

Branch: refs/heads/4.3
Commit: ea442fa81f9761538251b64d2f69d1f242d2bdc6
Parents: 289c8a0
Author: Kishan Kavala <kishan@cloud.com>
Authored: Tue Dec 24 16:34:03 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Tue Dec 24 18:07:58 2013 +0530

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea442fa8/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index a970af6..15b5ff2 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3719,6 +3719,14 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
                     typeString + " commands to the backend");
                     continue;
                 }
+
+                if (!checkRouterVersion(router)){
+                    //Rules will be applied after VR is upgraded
+                    s_logger.debug("Router " + router.getInstanceName() + " requires upgrade,
so not sending apply " +
+                            typeString + " commands to the backend");
+                    continue;
+                }
+
                 try {
                     result = applier.execute(network, router);
                     connectedRouters.add(router);


Mime
View raw message