mirror of
https://github.com/maxkratz/iflye.git
synced 2024-05-18 20:00:19 +00:00
Fixes conflicting method name for resetting the model +clean up in tests
This commit is contained in:
parent
eb1dd2c77e
commit
358fc441ea
|
@ -41,7 +41,7 @@ public abstract class AVneAlgorithmPathBandwidthBugTest extends AAlgorithmTest {
|
|||
public abstract void resetAlgo();
|
||||
|
||||
@BeforeEach
|
||||
public void resetModel() {
|
||||
public void reset() {
|
||||
facade.resetAll();
|
||||
}
|
||||
|
||||
|
|
|
@ -34,5 +34,5 @@ public class VneGipsAlgorithmPathBandwidthBugTest extends AVneAlgorithmPathBandw
|
|||
((VneGipsAlgorithm) algo).dispose();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -54,7 +54,7 @@ public class VneGipsMigrationAlgorithm extends AbstractAlgorithm {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Sanity check
|
||||
ModelFacade.getInstance().validateModel();
|
||||
ModelFacade.getInstance().updateAllPathsResidualBandwidth(sNet.getName());
|
||||
|
|
Loading…
Reference in a new issue