Fixes conflicting method name for resetting the model +clean up in tests

This commit is contained in:
Maximilian Kratz 2024-04-12 12:14:05 +02:00
parent eb1dd2c77e
commit 358fc441ea
7 changed files with 3 additions and 15 deletions

View file

@ -41,7 +41,7 @@ public abstract class AVneAlgorithmPathBandwidthBugTest extends AAlgorithmTest {
public abstract void resetAlgo();
@BeforeEach
public void resetModel() {
public void reset() {
facade.resetAll();
}

View file

@ -34,5 +34,5 @@ public class VneGipsAlgorithmPathBandwidthBugTest extends AVneAlgorithmPathBandw
((VneGipsAlgorithm) algo).dispose();
}
}
}

View file

@ -3,10 +3,7 @@ package test.algorithms.pm.pipeline;
import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import algorithms.AlgorithmConfig;
import algorithms.AlgorithmConfig.Objective;
import algorithms.pm.VnePmMdvneAlgorithmPipelineThreeStagesA;
import model.SubstrateNetwork;
import model.VirtualNetwork;

View file

@ -3,10 +3,7 @@ package test.algorithms.pm.pipeline;
import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import algorithms.AlgorithmConfig;
import algorithms.AlgorithmConfig.Objective;
import algorithms.pm.VnePmMdvneAlgorithmPipelineThreeStagesB;
import model.SubstrateNetwork;
import model.VirtualNetwork;

View file

@ -3,10 +3,7 @@ package test.algorithms.pm.pipeline;
import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import algorithms.AlgorithmConfig;
import algorithms.AlgorithmConfig.Objective;
import algorithms.pm.VnePmMdvneAlgorithmPipelineTwoStagesRackA;
import model.SubstrateNetwork;
import model.VirtualNetwork;

View file

@ -3,10 +3,7 @@ package test.algorithms.pm.pipeline;
import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import algorithms.AlgorithmConfig;
import algorithms.AlgorithmConfig.Objective;
import algorithms.pm.VnePmMdvneAlgorithmPipelineTwoStagesRackB;
import model.SubstrateNetwork;
import model.VirtualNetwork;

View file

@ -54,7 +54,7 @@ public class VneGipsMigrationAlgorithm extends AbstractAlgorithm {
}
}
}
// Sanity check
ModelFacade.getInstance().validateModel();
ModelFacade.getInstance().updateAllPathsResidualBandwidth(sNet.getName());