From 2e42e9f006091924ee8a43ec577f23bb97f2d37e Mon Sep 17 00:00:00 2001 From: "Tait,Trevor(rt0435)" Date: Wed, 5 Sep 2018 15:56:02 -0400 Subject: Update API from Demo feedback Issue-ID: LOG-643 Change-Id: I226075fa4b0f5fb6f8fadca34e0ce864d4c0684b Signed-off-by: Tait,Trevor(rt0435) --- src/test/java/org/onap/pomba/common/datatypes/NetworkTests.java | 4 ++-- src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java | 2 -- src/test/java/org/onap/pomba/common/datatypes/VfTests.java | 2 -- src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/onap/pomba/common/datatypes/NetworkTests.java b/src/test/java/org/onap/pomba/common/datatypes/NetworkTests.java index 747bc7c..cfc6129 100644 --- a/src/test/java/org/onap/pomba/common/datatypes/NetworkTests.java +++ b/src/test/java/org/onap/pomba/common/datatypes/NetworkTests.java @@ -32,7 +32,7 @@ public class NetworkTests { aNetwork.setName("Network name"); aNetwork.setInvariantUuid("Invariant Uuid"); aNetwork.setUuid("Uuid"); - aNetwork.setNfcNamingCode("NFC Naming Code"); + aNetwork.setType("Type"); DataQuality dataQuality = new DataQuality(); dataQuality.setStatus(Status.error); dataQuality.setErrorText("Test"); @@ -42,8 +42,8 @@ public class NetworkTests { aNetwork.addAttribute(attribute); assertTrue("Network name doesn't match", aNetwork.getName().equals("Network name")); assertTrue("Network invariant uuid doesn't match", aNetwork.getInvariantUuid().equals("Invariant Uuid")); - assertTrue("Network NFC Naming Code doesn't match", aNetwork.getNfcNamingCode().equals("NFC Naming Code")); assertTrue("Network uuid doesn't match", aNetwork.getUuid().equals("Uuid")); + assertTrue("Network type doesn't match", aNetwork.getType().equals("Type")); assertTrue("Network data quality status doesn't match", aNetwork.getDataQuality().getStatus().equals(Status.error)); assertTrue("Network data quality error text doesn't match", aNetwork.getDataQuality().getErrorText().equals("Test")); assertTrue("Network attribute name doesn't match", aNetwork.getAttributes().get(0).getName().equals(Name.hostName)); diff --git a/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java b/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java index 3d46510..d4840d2 100644 --- a/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java +++ b/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java @@ -32,7 +32,6 @@ public class VfModuleTests { aVFModule.setName("Name"); aVFModule.setInvariantUuid("Invariant Uuid"); aVFModule.setUuid("Uuid"); - aVFModule.setNfNamingCode("Nf Naming Code"); aVFModule.setMaxInstances(10); aVFModule.setMinInstances(1); DataQuality dataQuality = new DataQuality(); @@ -45,7 +44,6 @@ public class VfModuleTests { assertTrue("VFModule Name doesn't match", aVFModule.getName().equals("Name")); assertTrue("VFModule Invariant Uuid doesn't match", aVFModule.getInvariantUuid().equals("Invariant Uuid")); assertTrue("VFModule Uuid doesn't match", aVFModule.getUuid().equals("Uuid")); - assertTrue("VFModule Nf Naming Code doesn't match", aVFModule.getNfNamingCode().equals("Nf Naming Code")); assertEquals(aVFModule.getMaxInstances(), 10); assertEquals(aVFModule.getMinInstances(), 1); assertTrue("VFModule data quality status doesn't match", aVFModule.getDataQuality().getStatus().equals(Status.error)); diff --git a/src/test/java/org/onap/pomba/common/datatypes/VfTests.java b/src/test/java/org/onap/pomba/common/datatypes/VfTests.java index 464758e..11978f7 100644 --- a/src/test/java/org/onap/pomba/common/datatypes/VfTests.java +++ b/src/test/java/org/onap/pomba/common/datatypes/VfTests.java @@ -36,7 +36,6 @@ public class VfTests { aVF.setType("Type"); aVF.setInvariantUuid("Invariant Uuid"); aVF.setUuid("Uuid"); - aVF.setNfNamingCode("NF Naming Code"); DataQuality dataQuality = new DataQuality(); dataQuality.setStatus(Status.error); dataQuality.setErrorText("Test"); @@ -48,7 +47,6 @@ public class VfTests { assertTrue("VF Type doesn't match", aVF.getType().equals("Type")); assertTrue("VF Invariant Uuid doesn't match", aVF.getInvariantUuid().equals("Invariant Uuid")); assertTrue("VF Uuid doesn't match", aVF.getUuid().equals("Uuid")); - assertTrue("VF NF Naming Code doesn't match", aVF.getNfNamingCode().equals("NF Naming Code")); assertTrue("VF data quality status doesn't match", aVF.getDataQuality().getStatus().equals(Status.error)); assertTrue("VF data quality error text doesn't match", aVF.getDataQuality().getErrorText().equals("Test")); assertTrue("VF attribute name doesn't match", aVF.getAttributes().get(0).getName().equals(Name.hostName)); diff --git a/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java b/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java index 38d68fe..628c646 100644 --- a/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java +++ b/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java @@ -32,7 +32,7 @@ public class VnfcTests { aVNFC.setName("VNFC name"); aVNFC.setInvariantUuid("Invariant Uuid"); aVNFC.setUuid("Uuid"); - aVNFC.setNfcNamingCode("NFC Naming Code"); + aVNFC.setType("Type"); DataQuality dataQuality = new DataQuality(); dataQuality.setStatus(Status.error); dataQuality.setErrorText("Test"); @@ -42,8 +42,8 @@ public class VnfcTests { aVNFC.addAttribute(attribute); assertTrue("VNFC name doesn't match", aVNFC.getName().equals("VNFC name")); assertTrue("VNFC invariant uuid doesn't match", aVNFC.getInvariantUuid().equals("Invariant Uuid")); - assertTrue("VNFC NFC Naming Code doesn't match", aVNFC.getNfcNamingCode().equals("NFC Naming Code")); assertTrue("VNFC uuid doesn't match", aVNFC.getUuid().equals("Uuid")); + assertTrue("VNFC type doesn't match", aVNFC.getType().equals("Type")); assertTrue("VNFC data quality status doesn't match", aVNFC.getDataQuality().getStatus().equals(Status.error)); assertTrue("VNFC data quality error text doesn't match", aVNFC.getDataQuality().getErrorText().equals("Test")); assertTrue("VNFC attribute name doesn't match", aVNFC.getAttributes().get(0).getName().equals(Name.hostName)); -- cgit