Skip to content

[ZSTAC-86501] Backport ZSTAC-79353 to 5.4.10 #4378

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

Open
ZStack-Robot wants to merge 1 commit into
base: 5.4.10
Choose a base branch
from
Open

[ZSTAC-86501] Backport ZSTAC-79353 to 5.4.10 #4378

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
10 changes: 7 additions & 3 deletions plugin/sdnController/src/main/java/org/zstack/sdnController/SdnControllerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public String getSdnControllerSignature() {
return "sdn-controller-" + self.getUuid();
}

public String getSdnControllerHostSignature(String hostUuid) {
return "sdn-controller-" + self.getUuid() + "-host-" + hostUuid;
}

protected SdnController getSdnController() {
SdnControllerFactory factory = sdnMgr.getSdnControllerFactory(self.getVendorType());
return factory.getSdnController(self);
Expand Down Expand Up @@ -427,7 +431,7 @@ private void sdnControllerAddHost(APISdnControllerAddHostMsg msg, Completion com
thdf.chainSubmit(new ChainTask(completion) {
@Override
public String getSyncSignature() {
return getSdnControllerSignature();
return getSdnControllerHostSignature(msg.getHostUuid());
}

@Override
Expand Down Expand Up @@ -508,7 +512,7 @@ private void sdnControllerRemoveHostInQueue(SdnControllerRemoveHostMsg msg, Comp
thdf.chainSubmit(new ChainTask(completion) {
@Override
public String getSyncSignature() {
return getSdnControllerSignature();
return getSdnControllerHostSignature(msg.getHostUuid());
}

@Override
Expand Down Expand Up @@ -594,7 +598,7 @@ private void doControllerChangeHost(APISdnControllerChangeHostMsg msg, Completio
thdf.chainSubmit(new ChainTask(completion) {
@Override
public String getSyncSignature() {
return getSdnControllerSignature();
return getSdnControllerHostSignature(msg.getHostUuid());
}

@Override
Expand Down