You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/01/01 13:35:58 UTC
[1/2] git commit: updated refs/heads/master to 700184f
Updated Branches:
refs/heads/4.3 78b9d5cda -> 88ce5b804
refs/heads/master 79dc74dcb -> 700184f3b
Added config to enable/disable router version check
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/700184f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/700184f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/700184f3
Branch: refs/heads/master
Commit: 700184f3ba270be7a493d088990d8791ce80206d
Parents: 79dc74d
Author: Kishan Kavala <ki...@cloud.com>
Authored: Wed Jan 1 17:32:00 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Wed Jan 1 17:32:00 2014 +0530
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/700184f3/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 ee412b3..8904185 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -665,6 +665,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 {
@@ -4156,6 +4160,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;
}
@@ -4198,6 +4206,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {UseExternalDnsServers};
+ return new ConfigKey<?>[] {UseExternalDnsServers, routerVersionCheckEnabled};
}
}
[2/2] git commit: updated refs/heads/4.3 to 88ce5b8
Posted by ki...@apache.org.
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 <ki...@cloud.com>
Authored: Wed Jan 1 17:32:00 2014 +0530
Committer: Kishan Kavala <ki...@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};
}
}