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

add NSX resource , api client, create tier1 gw

This commit is contained in:
Pearl Dsilva 2023-08-24 06:35:41 -04:00
parent 5ef6ac103f
commit 0b7491a9d2
20 changed files with 618 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/network/NsxProvider.java
View File

@ -21,6 +21,8 @@ import org.apache.cloudstack.api.InternalIdentity;
public interface NsxProvider extends InternalIdentity, Identity {
String getHostname();
String getPort();
String getProviderName();
String getUsername();
long getZoneId();

2
api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
View File

@ -812,7 +812,7 @@ public class ApiConstants {
public static final String NSX_LOGICAL_SWITCH_PORT = "nsxlogicalswitchport";
public static final String NSX_PROVIDER_HOSTNAME = "nsxproviderhostname";
public static final String NSX_PROVIDER_PORT = "nsxproviderport";
public static final String NSX_CONTROLLER_ID = "nsxcontrollerid";
public static final String S3_ACCESS_KEY = "accesskey";
public static final String S3_SECRET_KEY = "secretkey";
public static final String S3_END_POINT = "endpoint";

12
engine/schema/src/main/java/com/cloud/network/element/NsxProviderVO.java
View File

@ -48,6 +48,9 @@ public class NsxProviderVO implements NsxProvider {
@Column(name = "hostname")
private String hostname;
@Column(name = "port")
private String port = "443";
@Column(name = "username")
private String username;
@ -117,6 +120,15 @@ public class NsxProviderVO implements NsxProvider {
return hostname;
}
public void setPort(String port) {
this.port = port;
}
@Override
public String getPort() {
return port;
}
public void setHostname(String hostname) {
this.hostname = hostname;
}

4
plugins/network-elements/nsx/pom.xml
View File

@ -53,8 +53,8 @@
</dependency>
<dependency>
<groupId>com.vmware.vapi</groupId>
<artifactId>vapi-authentication</artifactId>
<version>2.37.0</version>
<artifactId>vapi-runtime</artifactId>
<version>2.40.0</version>
</dependency>
</dependencies>
</project>

30
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/NsxAnswer.java Normal file
View File

@ -0,0 +1,30 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
public class NsxAnswer extends Answer {
public NsxAnswer(final Command command, final boolean success, final String details) {
super(command, success, details);
}
public NsxAnswer(final Command command, final Exception e) {
super(command, e);
}
}

26
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/StartupNsxCommand.java Normal file
View File

@ -0,0 +1,26 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack;
import com.cloud.agent.api.StartupCommand;
import com.cloud.host.Host;
public class StartupNsxCommand extends StartupCommand {
public StartupNsxCommand() {
super(Host.Type.L2Networking);
}
}

34
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxTier1GatewayCommand.java Normal file
View File

@ -0,0 +1,34 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.agent.api;
public class CreateNsxTier1GatewayCommand extends NsxCommand {
private String vpcName;
public CreateNsxTier1GatewayCommand(String zoneName, Long zoneId, String accountName, Long accountId, String vpcName) {
super(zoneName, zoneId, accountName, accountId);
this.vpcName = vpcName;
}
public String getVpcName() {
return vpcName;
}
public void setVpcName(String vpcName) {
this.vpcName = vpcName;
}
}

69
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxCommand.java Normal file
View File

@ -0,0 +1,69 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.agent.api;
import com.cloud.agent.api.Command;
public class NsxCommand extends Command {
private String zoneName;
private Long zoneId;
private String accountName;
private Long accountId;
public NsxCommand(String zoneName, Long zoneId, String accountName, Long accountId) {
this.zoneName = zoneName;
this.zoneId = zoneId;
this.accountName = accountName;
this.accountId = accountId;
}
public String getZoneName() {
return zoneName;
}
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
public Long getZoneId() {
return zoneId;
}
public void setZoneId(Long zoneId) {
this.zoneId = zoneId;
}
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
@Override
public boolean executeInSequence() {
return false;
}
}

11
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java Normal file
View File

@ -0,0 +1,11 @@
package org.apache.cloudstack.agent.api;
import com.cloud.agent.api.StartupCommand;
import com.cloud.host.Host;
public class StartupNsxCommand extends StartupCommand {
public StartupNsxCommand() {
super(Host.Type.L2Networking);
}
}

4
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/AddNsxControllerCmd.java
View File

@ -83,6 +83,10 @@ public class AddNsxControllerCmd extends BaseCmd {
return hostname;
}
public String getPort() {
return port;
}
public String getUsername() {
return username;
}

12
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/response/NsxControllerResponse.java
View File

@ -41,6 +41,10 @@ public class NsxControllerResponse extends BaseResponse {
@Param(description = "NSX controller hostname or IP address")
private String hostname;
@SerializedName(ApiConstants.PORT)
@Param(description = "NSX controller port")
private String port;
// TODO: Should Password be returned?
@SerializedName(ApiConstants.TIER0_GATEWAY)
@ -85,6 +89,14 @@ public class NsxControllerResponse extends BaseResponse {
this.hostname = hostname;
}
public String getPort() {
return port;
}
public void setPort(String port) {
this.port = port;
}
public String getTier0Gateway() {
return tier0Gateway;
}

123
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
View File

@ -16,14 +16,28 @@
// under the License.
package org.apache.cloudstack.resource;
import static org.apache.cloudstack.utils.NsxApiClientUtils.PoolAllocation.ROUTING;
import static org.apache.cloudstack.utils.NsxApiClientUtils.HAMode.ACTIVE_STANDBY;
import static org.apache.cloudstack.utils.NsxApiClientUtils.createApiClient;
import com.cloud.agent.IAgentControl;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.ReadyCommand;
import com.cloud.agent.api.ReadyAnswer;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.PingCommand;
import com.cloud.host.Host;
import com.cloud.resource.ServerResource;
import com.vmware.vapi.cis.authn.SecurityContextFactory;
import com.cloud.utils.exception.CloudRuntimeException;
import com.vmware.nsx_policy.infra.Tier1s;
import com.vmware.nsx_policy.model.ApiError;
import com.vmware.nsx_policy.model.Tier1;
import com.vmware.vapi.std.errors.Error;
import org.apache.cloudstack.NsxAnswer;
import org.apache.cloudstack.StartupNsxCommand;
import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
import org.apache.cloudstack.service.NsxApi;
import org.apache.log4j.Logger;
@ -32,13 +46,20 @@ import java.util.Map;
public class NsxResource implements ServerResource {
private static final Logger s_logger = Logger.getLogger(NsxResource.class);
private static final String TIER_0_GATEWAY_PATH_PREFIX = "/infra/tier-0s/";
private static final String TIER_1_RESOURCE_TYPE = "Tier1";
// private static final String ROUTING = "ROUTING";
private String name;
protected String hostname;
protected String username;
protected String password;
protected String guid;
protected String port;
protected String tier0Gateway;
protected String edgeCluster;
protected String zoneId;
protected NsxApi nsxApi;
@Override
public Host.Type getType() {
@ -47,7 +68,15 @@ public class NsxResource implements ServerResource {
@Override
public StartupCommand[] initialize() {
return new StartupCommand[0];
StartupNsxCommand sc = new StartupNsxCommand();
sc.setGuid(guid);
sc.setName(name);
sc.setDataCenter(zoneId);
sc.setPod("");
sc.setPrivateIpAddress("");
sc.setStorageIpAddress("");
sc.setVersion("");
return new StartupCommand[] {sc};
}
@Override
@ -57,7 +86,13 @@ public class NsxResource implements ServerResource {
@Override
public Answer executeRequest(Command cmd) {
return null;
if (cmd instanceof ReadyCommand) {
return executeRequest((ReadyCommand) cmd);
} if (cmd instanceof CreateNsxTier1GatewayCommand) {
return executeRequest((CreateNsxTier1GatewayCommand) cmd);
} else {
return Answer.createUnsupportedCommandAnswer(cmd);
}
}
@Override
@ -72,12 +107,11 @@ public class NsxResource implements ServerResource {
@Override
public void setAgentControl(IAgentControl agentControl) {
}
@Override
public String getName() {
return null;
return name;
}
@Override
@ -107,7 +141,78 @@ public class NsxResource implements ServerResource {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
return false;
hostname = (String) params.get("hostname");
if (hostname == null) {
throw new ConfigurationException("Missing NSX hostname from params: " + params);
}
port = (String) params.get("port");
if (port == null) {
throw new ConfigurationException("Missing NSX port from params: " + params);
}
username = (String) params.get("username");
if (username == null) {
throw new ConfigurationException("Missing NSX username from params: " + params);
}
password = (String) params.get("password");
if (password == null) {
throw new ConfigurationException("Missing NSX password from params: " + params);
}
this.name = (String) params.get("name");
if (this.name == null) {
throw new ConfigurationException("Unable to find name");
}
guid = (String) params.get("guid");
if (guid == null) {
throw new ConfigurationException("Unable to find the guid");
}
zoneId = (String) params.get("zoneId");
if (zoneId == null) {
throw new ConfigurationException("Unable to find zone");
}
edgeCluster = (String) params.get("edgeCluster");
if (edgeCluster == null) {
throw new ConfigurationException("Missing NSX edgeCluster");
}
nsxApi = new NsxApi();
nsxApi.setApiClient(createApiClient(hostname, port, username, password.toCharArray()));
return true;
}
private Answer executeRequest(ReadyCommand cmd) {
return new ReadyAnswer(cmd);
}
private Answer executeRequest(CreateNsxTier1GatewayCommand cmd) {
String tier0GatewayPath = TIER_0_GATEWAY_PATH_PREFIX + tier0Gateway;
String name = getVpcName(cmd);
Tier1s tier1service = nsxApi.getApiClient().createStub(Tier1s.class);
Tier1 tier1 = new Tier1.Builder()
.setTier0Path(tier0GatewayPath)
.setResourceType(TIER_1_RESOURCE_TYPE)
.setPoolAllocation(ROUTING.name())
.setHaMode(ACTIVE_STANDBY.name())
.setId(name)
.setDisplayName(name)
.build();
try {
tier1service.patch(name, tier1);
} catch (Error error) {
ApiError ae = error.getData()._convertTo(ApiError.class);
return new NsxAnswer(cmd, new CloudRuntimeException(ae.getErrorMessage()));
}
return new NsxAnswer(cmd, true, "");
}
private String getVpcName(CreateNsxTier1GatewayCommand cmd) {
return cmd.getZoneName() + "-" + cmd.getAccountName() + "-" + cmd.getVpcName();
}
@Override

35
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java Normal file
View File

@ -0,0 +1,35 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.service;
import com.vmware.vapi.client.ApiClient;
import org.apache.log4j.Logger;
public class NsxApi {
private static final Logger S_LOGGER = Logger.getLogger(NsxApi.class);
ApiClient apiClient;
public ApiClient getApiClient() {
return apiClient;
}
public void setApiClient(ApiClient apiClient) {
this.apiClient = apiClient;
}
}

42
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxControllerUtils.java Normal file
View File

@ -0,0 +1,42 @@
package org.apache.cloudstack.service;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.network.dao.NsxProviderDao;
import com.cloud.network.element.NsxProviderVO;
import org.apache.cloudstack.NsxAnswer;
import org.apache.cloudstack.agent.api.NsxCommand;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
@Component
public class NsxControllerUtils {
private static final Logger s_logger = Logger.getLogger(NsxControllerUtils.class);
@Inject
AgentManager agentMgr;
@Inject
NsxProviderDao nsxProviderDao;
public NsxAnswer sendNsxCommand(NsxCommand cmd, long zoneId) throws IllegalArgumentException {
NsxProviderVO nsxProviderVO = nsxProviderDao.findByZoneId(zoneId);
if (nsxProviderVO == null) {
s_logger.error("No NSX controller was found!");
throw new InvalidParameterValueException("Failed to find an NSX controller");
}
Answer answer = agentMgr.sendTo(zoneId, Hypervisor.HypervisorType.VMware, cmd);
if (answer == null || !answer.getResult()) {
s_logger.error("NSX API Command failed");
throw new InvalidParameterValueException("Failed API call to NSX controller");
}
return (NsxAnswer) answer;
}
}

89
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
View File

@ -16,29 +16,58 @@
// under the License.
package org.apache.cloudstack.service;
import com.cloud.agent.api.StartupCommand;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.HostVO;
import com.cloud.network.Network;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.element.DhcpServiceProvider;
import com.cloud.network.element.DnsServiceProvider;
import com.cloud.network.element.VpcProvider;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.network.vpc.PrivateGateway;
import com.cloud.network.vpc.StaticRouteProfile;
import com.cloud.network.vpc.Vpc;
import com.cloud.offering.NetworkOffering;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.Objects;
@Component
public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider {
public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider, VpcProvider,
ResourceStateAdapter {
@Inject
RouterDeploymentDefinitionBuilder routerDeploymentDefinitionBuilder;
@Inject
AccountManager accountMgr;
@Inject
NsxServiceImpl nsxService;
@Inject
DataCenterDao dataCenterDao;
private static final Logger LOGGER = Logger.getLogger(NsxElement.class);
private final Map<Network.Service, Map<Network.Capability, String>> capabilities = initCapabilities();
@ -163,4 +192,60 @@ public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsS
public boolean stop() {
return false;
}
@Override
public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd) {
return null;
}
@Override
public HostVO createHostVOForDirectConnectAgent(HostVO host, StartupCommand[] startup, ServerResource resource, Map<String, String> details, List<String> hostTags) {
return null;
}
@Override
public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) throws UnableDeleteHostException {
return null;
}
@Override
public boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
DataCenterVO zone = dataCenterDao.findById(vpc.getZoneId());
if (Network.Provider.Nsx.getName().equalsIgnoreCase(zone.getDhcpProvider())) {
if (Objects.isNull(zone)) {
throw new InvalidParameterValueException(String.format("Failed to find zone with id %s", vpc.getZoneId()));
}
Account account = accountMgr.getAccount(vpc.getAccountId());
if (Objects.isNull(account)) {
throw new InvalidParameterValueException(String.format("Failed to find account with id %s", vpc.getAccountId()));
}
return nsxService.createVpcNetwork(vpc.getZoneId(), zone.getName(), account.getAccountId(), account.getName(), vpc.getName());
}
return true;
}
@Override
public boolean shutdownVpc(Vpc vpc, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
return false;
}
@Override
public boolean createPrivateGateway(PrivateGateway gateway) throws ConcurrentOperationException, ResourceUnavailableException {
return false;
}
@Override
public boolean deletePrivateGateway(PrivateGateway privateGateway) throws ConcurrentOperationException, ResourceUnavailableException {
return false;
}
@Override
public boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException {
return false;
}
@Override
public boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
return false;
}
}

50
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderServiceImpl.java
View File

@ -20,8 +20,6 @@ import com.amazonaws.util.CollectionUtils;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.DetailVO;
import com.cloud.host.Host;
import com.cloud.host.dao.HostDetailsDao;
import com.cloud.network.Network;
import com.cloud.network.Networks;
@ -41,10 +39,19 @@ import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.command.AddNsxControllerCmd;
import org.apache.cloudstack.api.response.NsxControllerResponse;
import org.apache.cloudstack.resource.NsxResource;
import org.apache.commons.lang3.StringUtils;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
public class NsxProviderServiceImpl implements NsxProviderService {
@ -63,19 +70,21 @@ public class NsxProviderServiceImpl implements NsxProviderService {
@Override
public NsxProvider addProvider(AddNsxControllerCmd cmd) {
Long zoneId = cmd.getZoneId();
String name = cmd.getName();
String hostname = cmd.getHostname();
String username = cmd.getUsername();
String password = cmd.getPassword();
String tier0Gateway = cmd.getTier0Gateway();
String edgeCluster = cmd.getEdgeCluster();
final Long zoneId = cmd.getZoneId();
final String name = cmd.getName();
final String hostname = cmd.getHostname();
final String port = cmd.getPort() == null || cmd.getPort().equals(StringUtils.EMPTY) ? "443" : cmd.getPort();
final String username = cmd.getUsername();
final String password = cmd.getPassword();
final String tier0Gateway = cmd.getTier0Gateway();
final String edgeCluster = cmd.getEdgeCluster();
Map<String, String> params = new HashMap<>();
params.put("guid", UUID.randomUUID().toString());
params.put("zoneId", zoneId.toString());
params.put("name", name);
params.put("hostname", hostname);
params.put("port", port);
params.put("username", username);
params.put("password", password);
params.put("tier0Gateway", tier0Gateway);
@ -87,22 +96,22 @@ public class NsxProviderServiceImpl implements NsxProviderService {
NsxResource nsxResource = new NsxResource();
try {
nsxResource.configure(hostname, hostdetails);
final Host host = resourceManager.addHost(zoneId, nsxResource, nsxResource.getType(), params);
if (host != null) {
//final Host host = resourceManager.addHost(zoneId, nsxResource, nsxResource.getType(), params);
//if (host != null) {
nsxProvider = Transaction.execute((TransactionCallback<NsxProviderVO>) status -> {
NsxProviderVO nsxProviderVO = new NsxProviderVO(zoneId, name, hostname,
username, password, tier0Gateway, edgeCluster);
nsxProviderDao.persist(nsxProviderVO);
DetailVO detail = new DetailVO(host.getId(), "nsxcontrollerid",
String.valueOf(nsxProviderVO.getId()));
hostDetailsDao.persist(detail);
// DetailVO detail = new DetailVO(host.getId(), "nsxcontrollerid",
// String.valueOf(nsxProviderVO.getId()));
// hostDetailsDao.persist(detail);
return nsxProviderVO;
});
} else {
throw new CloudRuntimeException("Failed to add NSX controller due to internal error.");
}
// } else {
// throw new CloudRuntimeException("Failed to add NSX controller due to internal error.");
// }
} catch (ConfigurationException e) {
throw new CloudRuntimeException(e.getMessage());
}
@ -118,6 +127,7 @@ public class NsxProviderServiceImpl implements NsxProviderService {
NsxControllerResponse response = new NsxControllerResponse();
response.setName(nsxProvider.getProviderName());
response.setHostname(nsxProvider.getHostname());
response.setPort(nsxProvider.getPort());
response.setZoneId(nsxProvider.getZoneId());
response.setZoneName(zone.getName());
response.setTier0Gateway(nsxProvider.getTier0Gateway());
@ -130,7 +140,9 @@ public class NsxProviderServiceImpl implements NsxProviderService {
List<BaseResponse> nsxControllersResponseList = new ArrayList<>();
if (zoneId != null) {
NsxProviderVO nsxProviderVO = nsxProviderDao.findByZoneId(zoneId);
nsxControllersResponseList.add(createNsxControllerResponse(nsxProviderVO));
if (Objects.nonNull(nsxProviderVO)) {
nsxControllersResponseList.add(createNsxControllerResponse(nsxProviderVO));
}
} else {
List<NsxProviderVO> nsxProviderVOList = nsxProviderDao.listAll();
for (NsxProviderVO nsxProviderVO : nsxProviderVOList) {

13
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
View File

@ -16,5 +16,18 @@
// under the License.
package org.apache.cloudstack.service;
import org.apache.cloudstack.NsxAnswer;
import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
import javax.inject.Inject;
public class NsxServiceImpl implements NsxService {
@Inject
private NsxControllerUtils nsxControllerUtils;
public boolean createVpcNetwork(Long zoneId, String zoneName, Long accountId, String accountName, String vpcName) {
CreateNsxTier1GatewayCommand createNsxTier1GatewayCommand =
new CreateNsxTier1GatewayCommand(zoneName, zoneId, accountName, accountId, vpcName);
NsxAnswer result = nsxControllerUtils.sendNsxCommand(createNsxTier1GatewayCommand, zoneId);
return result.getResult();
}
}

73
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxApiClientUtils.java Normal file
View File

@ -0,0 +1,73 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.utils;
import com.vmware.vapi.bindings.StubConfiguration;
import com.vmware.vapi.cis.authn.SecurityContextFactory;
import com.vmware.vapi.client.ApiClient;
import com.vmware.vapi.client.ApiClients;
import com.vmware.vapi.client.Configuration;
import com.vmware.vapi.core.ExecutionContext.SecurityContext;
import com.vmware.vapi.internal.protocol.RestProtocol;
import com.vmware.vapi.internal.protocol.client.rest.authn.BasicAuthenticationAppender;
import com.vmware.vapi.protocol.HttpConfiguration;
import org.apache.log4j.Logger;
public class NsxApiClientUtils {
private static final Logger S_LOGGER = Logger.getLogger(NsxApiClientUtils.class);
public static ApiClient apiClient = null;
public static final int RESPONSE_TIMEOUT_SECONDS = 60;
public enum PoolAllocation {
ROUTING,
LB_SMALL,
LB_MEDIUM,
LB_LARGE,
LB_XLARGE
}
public enum HAMode {
ACTIVE_STANDBY,
ACTIVE_ACTIVE
}
public static ApiClient createApiClient(String hostname, String port, String username, char[] password) {
String controllerUrl = String.format("https://%s:%s", hostname, port);
HttpConfiguration.SslConfiguration.Builder sslConfigBuilder = new HttpConfiguration.SslConfiguration.Builder();
sslConfigBuilder
.disableCertificateValidation()
.disableHostnameVerification();
HttpConfiguration.SslConfiguration sslConfig = sslConfigBuilder.getConfig();
HttpConfiguration httpConfig = new HttpConfiguration.Builder()
.setSoTimeout(RESPONSE_TIMEOUT_SECONDS * 1000)
.setSslConfiguration(sslConfig).getConfig();
StubConfiguration stubConfig = new StubConfiguration();
SecurityContext securityContext = SecurityContextFactory
.createUserPassSecurityContext(username, password);
stubConfig.setSecurityContext(securityContext);
Configuration.Builder configBuilder = new Configuration.Builder()
.register(Configuration.HTTP_CONFIG_CFG, httpConfig)
.register(Configuration.STUB_CONFIG_CFG, stubConfig)
.register(RestProtocol.REST_REQUEST_AUTHENTICATOR_CFG, new BasicAuthenticationAppender());
Configuration config = configBuilder.build();
apiClient = ApiClients.newRestClient(controllerUrl, config);
return apiClient;
}
}

4
plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml
View File

@ -28,9 +28,11 @@
<bean id="Nsx" class="org.apache.cloudstack.service.NsxElement">
<property name="name" value="Nsx"/>
</bean>
<bean id="NsxGuestNetworkGuru" class="org.apache.cloudstack.service.NsxGuestNetworkGuru">
<bean id="nsxGuestNetworkGuru" class="org.apache.cloudstack.service.NsxGuestNetworkGuru">
<property name="name" value="NsxGuestNetworkGuru" />
</bean>
<bean id="nsxProviderService" class="org.apache.cloudstack.service.NsxProviderServiceImpl"/>
<bean id="nsxService" class="org.apache.cloudstack.service.NsxServiceImpl"/>
<bean id="nsxControllerUtils" class="org.apache.cloudstack.service.NsxControllerUtils" />
</beans>

17
ui/src/views/infra/network/ServiceProvidersTab.vue
View File

@ -1056,6 +1056,22 @@ export default {
columns: ['name', 'tungstenproviderhostname', 'tungstenproviderport', 'tungstengateway', 'tungstenprovidervrouterport', 'tungstenproviderintrospectport']
}
]
},
{
title: 'Nsx',
details: ['name', 'state', 'id', 'physicalnetworkid', 'servicelist'],
lists: [
{
title: 'label.nsx.controller',
api: 'listNsxControllers',
mapping: {
zoneid: {
value: (record) => { return record.zoneid }
}
},
columns: ['name', 'hostname', 'port', 'tier0gateway', 'edgecluster']
}
]
}
]
}
@ -1096,6 +1112,7 @@ export default {
this.fetchLoading = true
api('listNetworkServiceProviders', { physicalnetworkid: this.resource.id, name: name }).then(json => {
const sps = json.listnetworkserviceprovidersresponse.networkserviceprovider || []
console.log(sps)
if (sps.length > 0) {
for (const sp of sps) {
this.nsps[sp.name] = sp