Merge pull request #2445 from telstra/fix/revert-rules-validate

Revert rules validate to use old code
telstra · Jun 4, 2019 · 33e60c2 · 33e60c2
2 parents 04e8857 + 7318e98
commit 33e60c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...und-service/northbound/src/main/java/org/openkilda/northbound/converter/SwitchMapper.java b/...und-service/northbound/src/main/java/org/openkilda/northbound/converter/SwitchMapper.java
@@ -76,6 +76,8 @@ default SwitchDto toSwitchDto(SwitchInfoData data) {
     @Mapping(source = "rules.proper", target = "properRules")
     RulesValidationResult toRulesValidationResult(SwitchValidationResponse response);
 
+    RulesValidationResult toRulesValidationResult(SyncRulesResponse response);
+
     RulesValidationDto toRulesValidationResult(RulesValidationEntry data);
 
     MetersValidationDto toMetersValidationResult(MetersValidationEntry data);

diff --git a/...ice/northbound/src/main/java/org/openkilda/northbound/service/impl/SwitchServiceImpl.java b/...ice/northbound/src/main/java/org/openkilda/northbound/service/impl/SwitchServiceImpl.java
@@ -30,6 +30,7 @@
 import org.openkilda.messaging.command.switches.SwitchRulesDeleteRequest;
 import org.openkilda.messaging.command.switches.SwitchRulesInstallRequest;
 import org.openkilda.messaging.command.switches.SwitchValidateRequest;
+import org.openkilda.messaging.command.switches.ValidateRulesRequest;
 import org.openkilda.messaging.info.event.SwitchInfoData;
 import org.openkilda.messaging.info.meter.SwitchMeterEntries;
 import org.openkilda.messaging.info.rule.FlowEntry;
@@ -212,10 +213,10 @@ public CompletableFuture<RulesValidationResult> validateRules(SwitchId switchId)
         final String correlationId = RequestCorrelationId.getId();
 
         CommandMessage validateCommandMessage = new CommandMessage(
-                new SwitchValidateRequest(switchId, false), System.currentTimeMillis(), correlationId);
+                new ValidateRulesRequest(switchId), System.currentTimeMillis(), correlationId);
 
-        return messagingChannel.sendAndGet(switchManagerTopic, validateCommandMessage)
-                .thenApply(SwitchValidationResponse.class::cast)
+        return messagingChannel.sendAndGet(floodlightTopic, validateCommandMessage)
+                .thenApply(SyncRulesResponse.class::cast)
                 .thenApply(switchMapper::toRulesValidationResult);
     }