import org.junit.rules.ExpectedException;
import org.onap.aai.babel.csar.CsarConverterException;
import org.onap.aai.babel.csar.CsarToXmlConverter;
+import org.onap.aai.babel.parser.ArtifactGeneratorToscaParser;
import org.onap.aai.babel.service.data.BabelArtifact;
import org.onap.aai.babel.util.ArtifactTestUtils;
import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
-import org.onap.aai.babel.xml.generator.data.GeneratorConstants;
/**
* Tests {@link CsarToXmlConverter}
}
private enum CsarTest {
- VALID_CSAR_FILE("service-SdWanServiceTest-csar.csar"), NO_YAML_FILES("noYmlFilesArchive.zip");
+ VALID_CSAR_FILE(
+ "service-SdWanServiceTest-csar.csar"
+ ),
+ NO_YAML_FILES(
+ "noYmlFilesArchive.zip"
+ ),
+ PORT_MIRROR_CSAR(
+ "service_PortMirror.csar"
+ );
private String filename;
private ArtifactTestUtils artifactTestUtils = new ArtifactTestUtils();
@Before
public void setup() {
- System.setProperty(GeneratorConstants.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
+ System.setProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE,
new ArtifactTestUtils().getResourcePath(ARTIFACT_GENERATOR_CONFIG));
converter = new CsarToXmlConverter();
}
}
@Test(expected = NullPointerException.class)
- public void generateXmlFromCsar_nullArtifactSupplied() throws CsarConverterException {
+ public void testNullArtifactSupplied() throws CsarConverterException {
converter.generateXmlFromCsar(null, null, null);
}
@Test(expected = NullPointerException.class)
- public void generateXmlFromCsar_missingName() throws CsarConverterException, IOException {
+ public void testMissingName() throws CsarConverterException, IOException {
converter.generateXmlFromCsar(CsarTest.VALID_CSAR_FILE.getContent(), null, null);
}
@Test(expected = NullPointerException.class)
- public void generateXmlFromCsar_missingVersion() throws CsarConverterException, IOException {
+ public void testMissingVersion() throws CsarConverterException, IOException {
converter.generateXmlFromCsar(CsarTest.VALID_CSAR_FILE.getContent(), INCORRECT_CSAR_NAME, null);
}
@Test(expected = CsarConverterException.class)
- public void generateXmlFromCsar_noPayloadExists() throws CsarConverterException {
+ public void testNoPayloadExists() throws CsarConverterException {
converter.generateXmlFromCsar(new byte[0], INCORRECT_CSAR_NAME, SERVICE_VERSION);
}
@Test(expected = CsarConverterException.class)
- public void generateXmlFromCsar_csarFileHasNoYmlFiles() throws CsarConverterException, IOException {
+ public void testCsarFileHasNoYmlFiles() throws CsarConverterException, IOException {
converter.generateXmlFromCsar(CsarTest.NO_YAML_FILES.getContent(), "noYmlFilesArchive.zip", SERVICE_VERSION);
}
exception.expectMessage("Cannot generate artifacts. artifactgenerator.config system property not configured");
// Unset the required system property
- System.clearProperty(GeneratorConstants.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE);
+ System.clearProperty(ArtifactGeneratorToscaParser.PROPERTY_ARTIFACT_GENERATOR_CONFIG_FILE);
converter.generateXmlFromCsar(CsarTest.VALID_CSAR_FILE.getContent(), CsarTest.VALID_CSAR_FILE.getName(),
SERVICE_VERSION);
}
ga.getPayload(), matches(expectedXmlFiles.get(ga.getName()))));
}
+ @Test
+ public void generatePortMirrorConfigurationModel()
+ throws CsarConverterException, IOException, XmlArtifactGenerationException {
+ Map<String, String> expectedXmlFiles = createExpectedXmlFiles();
+ List<BabelArtifact> generatedArtifacts = converter.generateXmlFromCsar(CsarTest.PORT_MIRROR_CSAR.getContent(),
+ CsarTest.PORT_MIRROR_CSAR.getName(), SERVICE_VERSION);
+
+ generatedArtifacts
+ .forEach(ga -> assertThat("The content of " + ga.getName() + " must match the expected content",
+ ga.getPayload(), matches(expectedXmlFiles.get(ga.getName()))));
+ }
+
public Matcher<String> matches(final String expected) {
return new BaseMatcher<String>() {
protected String theExpected = expected;
filesToLoad.add("AAI-SdWanTestVsp..DUMMY..module-0-resource-2.xml");
filesToLoad.add("AAI-Tunnel_XConnTest-resource-2.0.xml");
filesToLoad.add("AAI-SD-WAN-Test-VSP-resource-1.0.xml");
+ filesToLoad.add("AAI-Port Mirror_Test-service-1.0.xml");
+ filesToLoad.add("AAI-Port Mirroring Configuration-resource-35.0.xml");
for (String filename : filesToLoad) {
xmlMap.put(filename, new ArtifactTestUtils().loadResourceAsString("generatedXml/" + filename));