You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/01/02 15:36:40 UTC
[48/50] [abbrv] git commit: updated refs/heads/reporter to b26f3fc
CLOUDSTACK-8134. Worker VMs don't have MS id set in vCenter annotation 'cloud.vm.workertag'.
Correctly register node info for a newly created VMware context.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13bdc1ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13bdc1ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13bdc1ce
Branch: refs/heads/reporter
Commit: 13bdc1cef4ee0fae2f263777317c170302c49689
Parents: c7b23d0
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Dec 30 11:48:06 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Dec 30 11:52:56 2014 +0530
----------------------------------------------------------------------
.../VmwareSecondaryStorageResourceHandler.java | 23 +++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13bdc1ce/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
index e67fed6..8a27799 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
@@ -209,23 +209,20 @@ public class VmwareSecondaryStorageResourceHandler implements SecondaryStorageRe
_resource.ensureOutgoingRuleForAddress(vCenterAddress);
VmwareContext context = currentContext.get();
- if (context != null) {
- if(!context.validate()) {
- invalidateServiceContext(context);
- context = null;
- } else {
- context.registerStockObject("serviceconsole", cmd.getContextParam("serviceconsole"));
- context.registerStockObject("manageportgroup", cmd.getContextParam("manageportgroup"));
- context.registerStockObject("noderuninfo", cmd.getContextParam("noderuninfo"));
- }
+ if (context != null && !context.validate()) {
+ invalidateServiceContext(context);
+ context = null;
}
- if(context == null) {
- s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " +
- StringUtils.getMaskedPasswordForDisplay(password));
+ if (context == null) {
+ s_logger.info("Open new VmwareContext. vCenter: " + vCenterAddress + ", user: " + username + ", password: " + StringUtils.getMaskedPasswordForDisplay(password));
VmwareSecondaryStorageContextFactory.setVcenterSessionTimeout(vCenterSessionTimeout);
context = VmwareSecondaryStorageContextFactory.getContext(vCenterAddress, username, password);
}
-
+ if (context != null) {
+ context.registerStockObject("serviceconsole", cmd.getContextParam("serviceconsole"));
+ context.registerStockObject("manageportgroup", cmd.getContextParam("manageportgroup"));
+ context.registerStockObject("noderuninfo", cmd.getContextParam("noderuninfo"));
+ }
currentContext.set(context);
return context;
} catch (Exception e) {