Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/801#discussion_r43050603 --- Diff: plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java --- @@ -152,50 +241,185 @@ public NuageVspDeviceVO addNuageVspDevice(AddNuageVspDeviceCmd cmd) { throw new CloudRuntimeException("A NuageVsp device is already configured on this physical network"); } - Map<String, String> params = new HashMap<String, String>(); - params.put("guid", UUID.randomUUID().toString()); - params.put("zoneId", String.valueOf(physicalNetwork.getDataCenterId())); - params.put("physicalNetworkId", String.valueOf(physicalNetwork.getId())); - params.put("name", "Nuage VSD - " + cmd.getHostName()); - params.put("hostname", cmd.getHostName()); - params.put("cmsuser", cmd.getUserName()); - String cmsUserPasswordBase64 = org.apache.commons.codec.binary.StringUtils.newStringUtf8(Base64.encodeBase64(cmd.getPassword().getBytes(Charset.forName("UTF-8")))); - params.put("cmsuserpass", cmsUserPasswordBase64); - int port = cmd.getPort(); - if (0 == port) { - port = 443; - } - params.put("port", String.valueOf(port)); - params.put("apirelativepath", "/nuage/api/" + cmd.getApiVersion()); - params.put("retrycount", String.valueOf(cmd.getApiRetryCount())); - params.put("retryinterval", String.valueOf(cmd.getApiRetryInterval())); + try { + NuageVspPluginClientLoader clientLoader = NuageVspPluginClientLoader.getClientLoader(null, null, 1, 1, null); - Map<String, Object> hostdetails = new HashMap<String, Object>(); - hostdetails.putAll(params); + Map<String, Object> clientDefaults = clientLoader.getNuageVspManagerClient().getClientDefaults(); + String apiVersion = MoreObjects.firstNonNull(cmd.getApiVersion(), (String) clientDefaults.get("CURRENT_API_VERSION")); + if (!clientLoader.getNuageVspManagerClient().isSupportedApiVersion(apiVersion)) { + throw new CloudRuntimeException("Unsupported API version : " + apiVersion); + } - try { + Map<String, String> params = new HashMap<String, String>(); + params.put("guid", UUID.randomUUID().toString()); + params.put("zoneId", String.valueOf(physicalNetwork.getDataCenterId())); + params.put("physicalNetworkId", String.valueOf(physicalNetwork.getId())); + params.put("name", "Nuage VSD - " + cmd.getHostName()); + params.put("hostname", cmd.getHostName()); + params.put("cmsuser", cmd.getUserName()); + String cmsUserPasswordBase64 = org.apache.commons.codec.binary.StringUtils.newStringUtf8(Base64.encodeBase64(cmd.getPassword().getBytes())); + params.put("cmsuserpass", cmsUserPasswordBase64); + int port = cmd.getPort(); + if (0 == port) { + port = 8443; + } + params.put("port", String.valueOf(port)); + params.put("apiversion", apiVersion); + params.put("apirelativepath", "/nuage/api/" + apiVersion); + params.put("retrycount", String.valueOf(MoreObjects.firstNonNull(cmd.getApiRetryCount(), clientDefaults.get("DEFAULT_API_RETRY_COUNT")))); + params.put("retryinterval", String.valueOf(MoreObjects.firstNonNull(cmd.getApiRetryInterval(), clientDefaults.get("DEFAULT_API_RETRY_INTERVAL")))); + + final Map<String, Object> hostdetails = new HashMap<String, Object>(); + hostdetails.putAll(params); resource.configure(cmd.getHostName(), hostdetails); - final Host host = _resourceMgr.addHost(zoneId, resource, Host.Type.L2Networking, params); + Host host = _resourceMgr.addHost(zoneId, resource, Host.Type.L2Networking, params); if (host != null) { - return Transaction.execute(new TransactionCallback<NuageVspDeviceVO>() { - @Override - public NuageVspDeviceVO doInTransaction(TransactionStatus status) { - NuageVspDeviceVO nuageVspDevice = new NuageVspDeviceVO(host.getId(), physicalNetworkId, ntwkSvcProvider.getProviderName(), deviceName); - _nuageVspDao.persist(nuageVspDevice); - - DetailVO detail = new DetailVO(host.getId(), "nuagevspdeviceid", String.valueOf(nuageVspDevice.getId())); - _hostDetailsDao.persist(detail); - - return nuageVspDevice; - } - }); + NuageVspDeviceVO nuageVspDevice = new NuageVspDeviceVO(host.getId(), physicalNetworkId, ntwkSvcProvider.getProviderName(), deviceName); + _nuageVspDao.persist(nuageVspDevice); + + DetailVO detail = new DetailVO(host.getId(), "nuagevspdeviceid", String.valueOf(nuageVspDevice.getId())); + _hostDetailsDao.persist(detail); + + ConfigurationVO cmsIdConfig = _configDao.findByName("nuagevsp.cms.id"); + host = findNuageVspHost(nuageVspDevice.getHostId()); + SyncNuageVspCmsIdCommand syncCmd = new SyncNuageVspCmsIdCommand(SyncType.REGISTER, null); + SyncNuageVspCmsIdAnswer answer = (SyncNuageVspCmsIdAnswer) _agentMgr.easySend(nuageVspDevice.getHostId(), syncCmd); + if (answer != null && answer.getSuccess()) { + registerNewNuageVspDevice(cmsIdConfig, nuageVspDevice.getId() + ":" + answer.getNuageVspCmsId()); + + detail = new DetailVO(host.getId(), "nuagevspcmsid", answer.getNuageVspCmsId()); + _hostDetailsDao.persist(detail); + hostdetails.put("nuagevspcmsid", answer.getNuageVspCmsId()); + resource.configure((String) hostdetails.get("hostname"), hostdetails); + + auditDomainsOnVsp((HostVO) host, true, false); + } else { + throw new CloudRuntimeException("Failed to register CMS ID"); + } + return nuageVspDevice; } else { throw new CloudRuntimeException("Failed to add Nuage Vsp Device due to internal error."); } } catch (ConfigurationException e) { - throw new CloudRuntimeException(e.getMessage()); + s_logger.error("Failed to configure Nuage VSD resource", e); + throw new CloudRuntimeException("Failed to configure Nuage VSD resource", e); + } catch (ExecutionException ee) { + s_logger.error("Failed to add Nuage VSP device", ee); + throw new CloudRuntimeException("Failed to add Nuage VSP device", ee); --- End diff -- Please add identifying information about the Nuage device to the error messages.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---