Skip to content

<fix>[vrouter]: ZSTAC-85527 select callback IP for VR #4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ZStack-Robot wants to merge 1 commit into from
Closed

<fix>[vrouter]: ZSTAC-85527 select callback IP for VR #4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/main/java/org/zstack/core/rest/RESTFacadeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,11 @@ public String getCallbackUrl() {
return callbackUrl;
}

@Override
public String buildCallbackUrl(String hostName) {
return buildCallbackUrl(hostName, port, path);
}

@Override
public String getHostName() {
return callbackHostName;
Expand Down
2 changes: 2 additions & 0 deletions header/src/main/java/org/zstack/header/rest/RESTFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ public interface RESTFacade {

String getCallbackUrl();

String buildCallbackUrl(String hostName);

String getHostName();

int getPort();
Expand Down
6 changes: 4 additions & 2 deletions ...lRouterProvider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ protected void handleLocalMessage(Message msg) {
void doPing(String vrUuid, ReturnValueCompletion<PingVirtualRouterVmReply> completion) {
PingCmd cmd = new PingCmd();
cmd.setUuid(vrUuid);
restf.asyncJsonPost(buildUrl(vr.getManagementNic().getIp(), VirtualRouterConstant.VR_PING), cmd, new JsonAsyncRESTCallback<PingRsp>(completion) {
restf.asyncJsonPost(buildUrl(vr.getManagementNic().getIp(), VirtualRouterConstant.VR_PING),
cmd, vrMgr.buildAgentCallbackUrlHeaders(vr.getManagementNic().getIp()), new JsonAsyncRESTCallback<PingRsp>(completion) {
@Override
public void fail(ErrorCode err) {
completion.fail(err);
Expand Down Expand Up @@ -685,7 +686,8 @@ public void run(final SyncTaskChain chain) {
self.getUuid(), msg.getPath()));
}

restf.asyncJsonPost(buildUrl(vr.getManagementNic().getIp(), msg.getPath()), msg.getCommand(), new JsonAsyncRESTCallback<LinkedHashMap>(msg, chain) {
restf.asyncJsonPost(buildUrl(vr.getManagementNic().getIp(), msg.getPath()),
msg.getCommand(), vrMgr.buildAgentCallbackUrlHeaders(vr.getManagementNic().getIp()), new JsonAsyncRESTCallback<LinkedHashMap>(msg, chain) {
@Override
public void fail(ErrorCode err) {
reply.setError(err);
Expand Down
3 changes: 3 additions & 0 deletions ...Provider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
import org.zstack.header.vm.VmNicInventory;

import java.util.List;
import java.util.Map;

public interface VirtualRouterManager {

VirtualRouterHypervisorBackend getHypervisorBackend(HypervisorType hypervisorType);

String buildUrl(String mgmtNicIp, String subPath);

Map<String, String> buildAgentCallbackUrlHeaders(String mgmtNicIp);

List<String> selectL3NetworksNeedingSpecificNetworkService(List<String> candidate, NetworkServiceType nsType);

List<String> selectGuestL3NetworksNeedingSpecificNetworkService(List<String> candidate, NetworkServiceType nsType, String publicUuid);
Expand Down
28 changes: 28 additions & 0 deletions ...ider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
import org.zstack.header.query.ExpandedQueryAliasStruct;
import org.zstack.header.query.ExpandedQueryStruct;
import org.zstack.header.query.QueryBelongFilter;
import org.zstack.header.rest.RESTConstant;
import org.zstack.header.rest.RESTFacade;
import org.zstack.header.tag.*;
import org.zstack.header.vm.*;
import org.zstack.identity.Account;
Expand Down Expand Up @@ -117,6 +119,9 @@ public class VirtualRouterManagerImpl extends AbstractService implements Virtual
private final Map<String, VirtualRouterHypervisorBackend> hypervisorBackends = new HashMap<String, VirtualRouterHypervisorBackend>();
private final Map<String, Integer> vrParallelismDegrees = new ConcurrentHashMap<String, Integer>();

@Autowired
private RESTFacade restf;

private List<String> virtualRouterPostCreateFlows;
private List<String> virtualRouterPostStartFlows;
private List<String> virtualRouterPostRebootFlows;
Expand Down Expand Up @@ -967,6 +972,29 @@ public String buildUrl(String mgmtNicIp, String subPath) {
return ub.build().toUriString();
}

@Override
public Map<String, String> buildAgentCallbackUrlHeaders(String mgmtNicIp) {
return Collections.singletonMap(RESTConstant.CALLBACK_URL, restf.buildCallbackUrl(selectManagementIpForAgent(mgmtNicIp)));
}

private String selectManagementIpForAgent(String agentIp) {
if (IPv6NetworkUtils.isIpv6Address(agentIp)) {
return Platform.getManagementServerIps().stream()
.filter(IPv6NetworkUtils::isIpv6Address)
.findFirst()
.orElse(Platform.getManagementServerIp());
}

if (NetworkUtils.isIpv4Address(agentIp)) {
return Platform.getManagementServerIps().stream()
.filter(NetworkUtils::isIpv4Address)
.findFirst()
.orElse(Platform.getManagementServerIp());
}

return Platform.getManagementServerIp();
}

private void buildWorkFlowBuilder() {
postCreateFlowsBuilder = FlowChainBuilder.newBuilder().setFlowClassNames(virtualRouterPostCreateFlows).construct();
postStartFlowsBuilder = FlowChainBuilder.newBuilder().setFlowClassNames(virtualRouterPostStartFlows).construct();
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/zstack/network/service/virtualrouter/lifecycle/VirtualRouterDeployAgentFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void run(final FlowTrigger trigger, Map data) {
cmd.setUuid(vr.getUuid());
cmd.setRestartDnsmasqAfterNumberOfSIGUSER1(VirtualRouterGlobalConfig.RESTART_DNSMASQ_COUNT.value(Integer.class));
if (timeout == null) {
restf.asyncJsonPost(url, cmd, new JsonAsyncRESTCallback<InitRsp>(trigger) {
restf.asyncJsonPost(url, cmd, vrMgr.buildAgentCallbackUrlHeaders(mgmtNic.getIp()), new JsonAsyncRESTCallback<InitRsp>(trigger) {
@Override
public void fail(ErrorCode err) {
trigger.fail(err);
Expand All @@ -131,7 +131,7 @@ public Class<InitRsp> getReturnClass() {
}
});
} else {
restf.asyncJsonPost(url, cmd, new JsonAsyncRESTCallback<InitRsp>(trigger) {
restf.asyncJsonPost(url, cmd, vrMgr.buildAgentCallbackUrlHeaders(mgmtNic.getIp()), new JsonAsyncRESTCallback<InitRsp>(trigger) {
@Override
public void fail(ErrorCode err) {
trigger.fail(err);
Expand Down
2 changes: 1 addition & 1 deletion ...Provider/src/main/java/org/zstack/network/service/virtualrouter/vyos/VyosConnectFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void run(final FlowTrigger trigger, Map data) {
cmd.setParms(parms);


restf.asyncJsonPost(url, cmd, new JsonAsyncRESTCallback<InitRsp>(trigger) {
restf.asyncJsonPost(url, cmd, vrMgr.buildAgentCallbackUrlHeaders(mgmtNic.getIp()), new JsonAsyncRESTCallback<InitRsp>(trigger) {
@Override
public void fail(ErrorCode err) {
errs.add(err);
Expand Down