Skip to content
Permalink
Browse files

Merge branch 'fix/defective_link_status' of https://github.com/telstr…

…a/open-kilda into functional/defective_link_status

# Conflicts:
#	services/src/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/links/LinkSpec.groovy
  • Loading branch information...
rtretyak committed Mar 14, 2019
2 parents 20aed64 + 2ec8220 commit 87660b9033c91ce79427a6114a0a22edf6208a91
@@ -253,8 +253,8 @@ private boolean processDiscoveryFailedIsl(Isl isl) {
IslStatus islStatus = IslStatus.MOVED == isl.getStatus() ? IslStatus.MOVED : IslStatus.INACTIVE;
Collection<Isl> isls = islRepository.findBySrcEndpoint(isl.getSrcSwitch().getSwitchId(), isl.getSrcPort())
.stream()
.filter(link -> IslStatus.ACTIVE == link.getStatus()
|| IslStatus.MOVED == islStatus)
.filter(link -> islStatus != link.getStatus()
|| islStatus != link.getActualStatus())
.collect(Collectors.toList());

for (Isl link : isls) {
@@ -140,7 +140,8 @@ public void shouldPutIslInMovedStatus() {
public void shouldNotFailIslDiscoverOnNotActiveIsl() {
Isl isl = createIsl();
isl.setStatus(IslStatus.INACTIVE);
islService.createOrUpdateIsl(isl);
isl.setActualStatus(IslStatus.INACTIVE);
islRepository.createOrUpdate(isl);

Isl foundIsl = islRepository.findByEndpoints(TEST_SWITCH_A_ID, TEST_SWITCH_A_PORT,
TEST_SWITCH_B_ID, TEST_SWITCH_B_PORT).get();

0 comments on commit 87660b9

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.