diff options
Diffstat (limited to 'dcae-analytics-model/src')
5 files changed, 24 insertions, 24 deletions
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java index 5a471a3..91cfdef 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java @@ -34,8 +34,8 @@ public class AAI extends BaseDynamicPropertiesProvider implements TCAFacadeModel private static final long serialVersionUID = 1L;
- private String genericVNFId;
+ private String genericVNFName;
- private String genericServerId;
+ private String genericServerName;
}
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java index 967cf88..b6b2b05 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java @@ -30,26 +30,26 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicProper */
public abstract class AAIMixin extends BaseDynamicPropertiesProviderMixin {
- private String genericVNFId;
- private String genericServerId;
+ private String genericVNFName;
+ private String genericServerName;
- @JsonGetter("generic-vnf.vnf-id")
- public String getGenericVNFId() {
- return genericVNFId;
+ @JsonGetter("generic-vnf.vnf-name")
+ public String getGenericVNFName() {
+ return genericVNFName;
}
- @JsonSetter("generic-vnf.vnf-id")
- public void setGenericVNFId(String genericVNFId) {
- this.genericVNFId = genericVNFId;
+ @JsonSetter("generic-vnf.vnf-name")
+ public void setGenericVNFName(String genericVNFName) {
+ this.genericVNFName = genericVNFName;
}
@JsonGetter("vserver.vserver-name")
- public String getGenericServerId() {
- return genericServerId;
+ public String getGenericServerName() {
+ return genericServerName;
}
@JsonSetter("vserver.vserver-name")
- public void setGenericServerId(String genericServerId) {
- this.genericServerId = genericServerId;
+ public void setGenericServerName(String genericServerName) {
+ this.genericServerName = genericServerName;
}
}
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java index f47b391..689633b 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java @@ -43,15 +43,15 @@ public class AAITest extends BaseAnalyticsModelUnitTest { @Test
public void getGenericVNFId() throws Exception {
- aai.setGenericVNFId(GENERIC_VNF_ID);
- assertThat("VNFID must be same", aai.getGenericVNFId(), is(GENERIC_VNF_ID));
+ aai.setGenericVNFName(GENERIC_VNF_ID);
+ assertThat("VNFID must be same", aai.getGenericVNFName(), is(GENERIC_VNF_ID));
}
@Test
public void setGenericVNFId() throws Exception {
final String genericVNFId = "testVNFID";
- aai.setGenericVNFId(GENERIC_VNF_ID);
- aai.setGenericVNFId(CHANGED_GENERIC_VNF_ID);
- assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFId(), is(CHANGED_GENERIC_VNF_ID));
+ aai.setGenericVNFName(GENERIC_VNF_ID);
+ aai.setGenericVNFName(CHANGED_GENERIC_VNF_ID);
+ assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFName(), is(CHANGED_GENERIC_VNF_ID));
}
}
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java index c58abf4..3724c8d 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java @@ -40,7 +40,7 @@ public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest { assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class);
assertThat("VES CEF Message Response AAI generics VNF Id must match",
- vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));
+ vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));
assertThat("VES CEF Message target type must be parsed correctly as VNF",
vesCEFMessageResponse.getTargetType(), is("VNF"));
@@ -56,8 +56,8 @@ public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest { assertThat("closedLoopEventClient must be tca.instance00001",
vesCEFMessageResponse.getClosedLoopEventClient(), is("tca.instance00001"));
assertThat("target_type must be VNF", vesCEFMessageResponse.getTargetType(), is("VNF"));
- assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-id"));
- assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFId(),
+ assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-name"));
+ assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFName(),
is("vpp-test(?)"));
assertThat("from must be DCAE", vesCEFMessageResponse.getFrom(), is("DCAE"));
assertThat("policyScope must be resource=vFirewall;type=configuration",
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java index ca9a288..98c52af 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java @@ -42,10 +42,10 @@ public class TCAVESResponseMixinTest extends BaseAnalyticsModelUnitTest { assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class);
assertThat("VES CEF Message Response AAI generics VNF Id must match",
- vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));
+ vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));
assertThat("VES CEF Message Response AAI generic Server Id must match",
- vesCEFMessageResponse.getAai().getGenericServerId(), is("dfw1lb01lb01"));
+ vesCEFMessageResponse.getAai().getGenericServerName(), is("dfw1lb01lb01"));
assertThat("VES CEF Message target type must be parsed correctly as VNF",
vesCEFMessageResponse.getTargetType(), is("VNF"));
|