Return-Path: 
 <commits-return-36318-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9D06210F8C
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed,  1 Jan 2014 12:36:07 +0000 (UTC)
Received: (qmail 37761 invoked by uid 500); 1 Jan 2014 12:36:04 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 37532 invoked by uid 500); 1 Jan 2014 12:36:00 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 37518 invoked by uid 99); 1 Jan 2014 12:35:58 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jan 2014 12:35:58 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 453399113CE; Wed,  1 Jan 2014 12:35:58 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: kishan@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 01 Jan 2014 12:35:59 -0000
Message-Id: <cc078fe26b6842be89d2def05269914a@git.apache.org>
In-Reply-To: <5357af59456744099c56f309c500056e@git.apache.org>
References: <5357af59456744099c56f309c500056e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: updated refs/heads/4.3 to 88ce5b8

Added config to enable/disable router version check

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java


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

Branch: refs/heads/4.3
Commit: 88ce5b804e4929e09c8cad0f5981bf97b5022b5d
Parents: 78b9d5c
Author: Kishan Kavala <kishan@cloud.com>
Authored: Wed Jan 1 17:32:00 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Wed Jan 1 17:34:35 2014 +0530

----------------------------------------------------------------------
 .../router/VirtualNetworkApplianceManagerImpl.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88ce5b80/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 2691ccb..f7ef5d7 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -515,6 +515,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
     }
     static final ConfigKey<Boolean> UseExternalDnsServers = new ConfigKey<Boolean>(Boolean.class, "use.external.dns", "Advanced", "false",
         "Bypass internal dns, use external dns1 and dns2", true, ConfigKey.Scope.Zone, null);
+
+    static final ConfigKey<Boolean> routerVersionCheckEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true",
+            "If true, router minimum required version is checked before sending command", false);
+
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
 
@@ -4091,6 +4095,10 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
     //Checks if the router is at the required version
     // Compares MS version and router version
     private boolean checkRouterVersion(VirtualRouter router){
+        if(!routerVersionCheckEnabled.value()){
+            //Router version check is disabled.
+            return true;
+        }
         if(router.getTemplateVersion() == null){
             return false;
         }
@@ -4132,6 +4140,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {UseExternalDnsServers};
+        return new ConfigKey<?>[] {UseExternalDnsServers, routerVersionCheckEnabled};
     }
 }