etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8956: Remove assert(false) on opaque network and ping method on NiciraNvpApiVersion

This commit is contained in:
nvazquez 2015-10-23 06:10:27 -07:00 committed by nvazquez
parent e1d1a40325
commit b20c5be1ce
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/NiciraNvpResource.java
View File

@ -190,7 +190,7 @@ public class NiciraNvpResource implements ServerResource {
ClusterRoleConfig[] configuredRoles = ccs.getConfiguredRoles();
if (configuredRoles != null){
String apiProviderMajorityVersion = searchApiProvider(configuredRoles);
NiciraNvpApiVersion.pingNiciraApiVersion(apiProviderMajorityVersion);
NiciraNvpApiVersion.setNiciraApiVersion(apiProviderMajorityVersion);
NiciraNvpApiVersion.logNiciraApiVersion();
}
}

25
utils/src/main/java/com/cloud/utils/nicira/nvp/plugin/NiciraNvpApiVersion.java
View File

@ -26,34 +26,19 @@ import com.cloud.maint.Version;
public class NiciraNvpApiVersion {
private static final Logger s_logger = Logger.getLogger(NiciraNvpApiVersion.class);
private static String niciraApiVersion = null;
private static String niciraApiVersion;
public static void pingNiciraApiVersion(String apiVersion){
if (apiVersion == null){
niciraApiVersion = null;
}
else{
if (niciraApiVersion == null){
setNiciraApiVersion(apiVersion);
}
else {
if (! apiVersion.equals(niciraApiVersion)){
setNiciraApiVersion(apiVersion);
}
}
}
}
private static void setNiciraApiVersion(String apiVersion){
public static synchronized void setNiciraApiVersion(String apiVersion){
niciraApiVersion = apiVersion;
}
public static boolean isApiVersionLowerThan(String apiVersion){
public static synchronized boolean isApiVersionLowerThan(String apiVersion){
if (niciraApiVersion == null) return false;
int compare = Version.compare(niciraApiVersion, apiVersion);
return (compare < 0);
}
public static void logNiciraApiVersion(){
public static synchronized void logNiciraApiVersion(){
s_logger.info("NSX API VERSION: " + ((niciraApiVersion != null) ? niciraApiVersion : " NOT PRESENT"));
}

1
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
View File

@ -103,7 +103,6 @@ public class VmwareHelper {
break;
default:
assert (false);
nic = new VirtualE1000();
}