diff options
| author |   Jennie Jia <Jennie.Jia@amdocs.com> | 2018-07-11 15:20:49 +0000 |
|---|---|---|
| committer | Jennie Jia <Jennie.Jia@amdocs.com> | 2018-07-16 17:24:51 +0000 |
| commit | 3c066a8a54727684ed1e72f25cd6979221ad1eb6 (patch) | |
| tree | 4a153b6b51134b21bbf1fd50de6ebffbfaddf1bb | |
| parent | 7216bebc1577320cef762a143d0ee8fda804e7c7 (diff) | |
Upstreaming the POMBA Audit Common Model
Issue-ID: LOG-569
Change-Id: Ib3dc4190d9f5f461fb5f0c50a30cfc45731c419b
Signed-off-by: Jennie Jia <Jennie.Jia@amdocs.com>
| -rw-r--r-- | .gitignore | 25 | ||||
| -rw-r--r-- | .gitreview | 4 | ||||
| -rw-r--r-- | README.md | 23 | ||||
| -rw-r--r-- | pom.xml | 51 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/common/datatypes/ModelContext.java | 50 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/common/datatypes/Service.java | 53 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/common/datatypes/VF.java | 97 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/common/datatypes/VFModule.java | 62 | ||||
| -rw-r--r-- | src/main/java/org/onap/pomba/common/datatypes/VNFC.java | 62 | ||||
| -rw-r--r-- | src/test/java/org/onap/pomba/common/datatypes/ModelContextTests.java | 60 | ||||
| -rw-r--r-- | src/test/java/org/onap/pomba/common/datatypes/ServiceTests.java | 36 | ||||
| -rw-r--r-- | src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java | 39 | ||||
| -rw-r--r-- | src/test/java/org/onap/pomba/common/datatypes/VfTests.java | 112 | ||||
| -rw-r--r-- | src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java | 37 | ||||
| -rw-r--r-- | version.properties | 13 |
15 files changed, 724 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d17923d --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..70e3b2a --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit]
+host=gerrit.onap.org
+port=29418
+project=logging-analytics/pomba/pomba-audit-common.git
diff --git a/README.md b/README.md new file mode 100644 index 0000000..c3880c7 --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +# POMBA Audit Common Model
+
+
+# Introduction
+
+POMBA Audit Common Model provides a common model between context-builders and the context-aggregator.
+Builders retrieve model data and convert it into the common model to be consumed by the context-aggregator.
+
+# Compiling POMBA Audit Common Model
+
+POMBA Audit Common Model can be compiled easily using maven command: `mvn clean install`
+The result is JAR file under "target" folder
+
+# Getting Help
+
+*** to be completed on release ***
+
+
+# Release notes for versions
+
+1.3.0-SNAPSHOT
+
+Initial ONAP release
@@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.onap.pomba.pomba-audit-common</groupId>
+ <artifactId>pomba-audit-common</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+
+ <parent>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>1.1.1</version>
+ <relativePath/>
+ </parent>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
diff --git a/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java new file mode 100644 index 0000000..6e5c0bb --- /dev/null +++ b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java @@ -0,0 +1,50 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class ModelContext {
+
+ @Expose
+ @SerializedName("service")
+ private Service service;
+ @Expose
+ @SerializedName("vf-list")
+ private List<VF> vf = new ArrayList<>();
+
+ public Service getService() {
+ return service;
+ }
+ public void setService(Service service) {
+ this.service = service;
+ }
+ public List<VF> getVf() {
+ return vf;
+ }
+ public void setVf(List<VF> vf) {
+ this.vf = vf;
+ }
+ public void addVf(VF vf) {
+ this.vf.add(vf);
+ }
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/Service.java b/src/main/java/org/onap/pomba/common/datatypes/Service.java new file mode 100644 index 0000000..e52e82e --- /dev/null +++ b/src/main/java/org/onap/pomba/common/datatypes/Service.java @@ -0,0 +1,53 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class Service {
+
+ @Expose
+ @SerializedName("name")
+ private String name;
+ @Expose
+ @SerializedName("invariant-id")
+ private String invariantUuid;
+ @Expose
+ @SerializedName("uuid")
+ private String uuid;
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+ public void setInvariantUuid(String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+ public String getUuid() {
+ return uuid;
+ }
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/VF.java b/src/main/java/org/onap/pomba/common/datatypes/VF.java new file mode 100644 index 0000000..83cf37d --- /dev/null +++ b/src/main/java/org/onap/pomba/common/datatypes/VF.java @@ -0,0 +1,97 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class VF {
+
+ @Expose
+ @SerializedName("name")
+ private String name;
+ @Expose
+ @SerializedName("type")
+ private String type;
+ @Expose
+ @SerializedName("invariant-id")
+ private String invariantUuid;
+ @Expose
+ @SerializedName("uuid")
+ private String uuid;
+ @Expose
+ @SerializedName("nf-naming-code")
+ private String nfNamingCode;
+ @Expose
+ @SerializedName("vf-module-list")
+ private List<VFModule> vfModules = new ArrayList<>();
+ @Expose
+ @SerializedName("vnfc-list")
+ private List<VNFC> vnfc = new ArrayList<>();
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+ public void setInvariantUuid(String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+ public String getUuid() {
+ return uuid;
+ }
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+ public String getNfNamingCode() {
+ return nfNamingCode;
+ }
+ public void setNfNamingCode(String nfNamingCode) {
+ this.nfNamingCode = nfNamingCode;
+ }
+ public List<VFModule> getVfModules() {
+ return vfModules;
+ }
+ public void setVfModules(List<VFModule> vfModules) {
+ this.vfModules = vfModules;
+ }
+ public void addVfModule(VFModule vfModule) {
+ this.vfModules.add(vfModule);
+ }
+ public List<VNFC> getVnfc() {
+ return vnfc;
+ }
+ public void setVnfc(List<VNFC> vnfc) {
+ this.vnfc = vnfc;
+ }
+ public void addVnfc(VNFC vnfc) {
+ this.vnfc.add(vnfc);
+ }
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/VFModule.java b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java new file mode 100644 index 0000000..7e3b0b1 --- /dev/null +++ b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java @@ -0,0 +1,62 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class VFModule {
+
+ @Expose
+ @SerializedName("invariant-id")
+ private String invariantUuid;
+ @Expose
+ @SerializedName("uuid")
+ private String uuid;
+ @Expose
+ @SerializedName("max-instances")
+ private int maxInstances;
+ @Expose
+ @SerializedName("min-instances")
+ private int minInstances;
+
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+ public void setInvariantUuid(String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+ public String getUuid() {
+ return uuid;
+ }
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+ public int getMaxInstances() {
+ return maxInstances;
+ }
+ public void setMaxInstances(int maxInstances) {
+ this.maxInstances = maxInstances;
+ }
+ public int getMinInstances() {
+ return minInstances;
+ }
+ public void setMinInstances(int minInstances) {
+ this.minInstances = minInstances;
+ }
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/VNFC.java b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java new file mode 100644 index 0000000..6eaee0d --- /dev/null +++ b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java @@ -0,0 +1,62 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class VNFC {
+
+ @Expose
+ @SerializedName("name")
+ private String name;
+ @Expose
+ @SerializedName("invariant-id")
+ private String invariantUuid;
+ @Expose
+ @SerializedName("uuid")
+ private String uuid;
+ @Expose
+ @SerializedName("nfc-naming-code")
+ private String nfcNamingCode;
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+ public void setInvariantUuid(String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+ public String getUuid() {
+ return uuid;
+ }
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+ public String getNfcNamingCode() {
+ return nfcNamingCode;
+ }
+ public void setNfcNamingCode(String nfcType) {
+ this.nfcNamingCode = nfcType;
+ }
+}
diff --git a/src/test/java/org/onap/pomba/common/datatypes/ModelContextTests.java b/src/test/java/org/onap/pomba/common/datatypes/ModelContextTests.java new file mode 100644 index 0000000..bad0523 --- /dev/null +++ b/src/test/java/org/onap/pomba/common/datatypes/ModelContextTests.java @@ -0,0 +1,60 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ModelContextTests {
+ @Test
+ public void testSetService() {
+ ModelContext modelContext = new ModelContext();
+ Service aService = new Service();
+ aService.setName("Service Name");
+ modelContext.setService(aService);
+ assertTrue("ModelContext service name doesn't match",
+ modelContext.getService().getName().equals("Service Name"));
+ }
+
+ @Test
+ public void testSetVf() {
+ ModelContext modelContext = new ModelContext();
+ List<VF> vfList = new ArrayList<VF>();
+ VF aVF = new VF();
+ aVF.setName("VF name");
+ vfList.add(aVF);
+ modelContext.setVf(vfList);
+ assertEquals(modelContext.getVf().size(), 1);
+ }
+
+ @Test
+ public void testAddVf() {
+ ModelContext modelContext = new ModelContext();
+ VF aVF = new VF();
+ aVF.setName("VF name");
+ modelContext.addVf(aVF);
+ assertEquals(modelContext.getVf().size(), 1);
+ assertTrue("ModelContext VF name doesn't match", modelContext.getVf().get(0).getName().equals("VF name"));
+ }
+
+}
diff --git a/src/test/java/org/onap/pomba/common/datatypes/ServiceTests.java b/src/test/java/org/onap/pomba/common/datatypes/ServiceTests.java new file mode 100644 index 0000000..1f7ba50 --- /dev/null +++ b/src/test/java/org/onap/pomba/common/datatypes/ServiceTests.java @@ -0,0 +1,36 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class ServiceTests {
+ @Test
+ public void testService() {
+ Service aService = new Service();
+ aService.setName("new service");
+ aService.setInvariantUuid("Invariant Uuid");
+ aService.setUuid("Uuid");
+
+ assertTrue("Service Name doesn't match", aService.getName().equals("new service"));
+ assertTrue("Invariant Uuid doesn't match", aService.getInvariantUuid().equals("Invariant Uuid"));
+ assertTrue("Uuid doesn't match", aService.getUuid().equals("Uuid"));
+ }
+}
diff --git a/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java b/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java new file mode 100644 index 0000000..afce299 --- /dev/null +++ b/src/test/java/org/onap/pomba/common/datatypes/VfModuleTests.java @@ -0,0 +1,39 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class VfModuleTests {
+ @Test
+ public void testVFModule() {
+ VFModule aVFModule = new VFModule();
+ aVFModule.setInvariantUuid("Invariant Uuid");
+ aVFModule.setUuid("Uuid");
+ aVFModule.setMaxInstances(10);
+ aVFModule.setMinInstances(1);
+
+ assertTrue("VFModule Invariant Uuid doesn't match", aVFModule.getInvariantUuid().equals("Invariant Uuid"));
+ assertTrue("VFModule Uuid doesn't match", aVFModule.getUuid().equals("Uuid"));
+ assertEquals(aVFModule.getMaxInstances(), 10);
+ assertEquals(aVFModule.getMinInstances(), 1);
+ }
+}
diff --git a/src/test/java/org/onap/pomba/common/datatypes/VfTests.java b/src/test/java/org/onap/pomba/common/datatypes/VfTests.java new file mode 100644 index 0000000..8b2a255 --- /dev/null +++ b/src/test/java/org/onap/pomba/common/datatypes/VfTests.java @@ -0,0 +1,112 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class VfTests {
+ @Test
+ public void testVF() {
+ VF aVF = new VF();
+ aVF.setName("VF name");
+ aVF.setType("Type");
+ aVF.setInvariantUuid("Invariant Uuid");
+ aVF.setUuid("Uuid");
+ aVF.setNfNamingCode("NF Naming Code");
+ assertTrue("VF name doesn't match", aVF.getName().equals("VF name"));
+ 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"));
+ }
+
+ @Test
+ public void testSetVFModuleList() {
+ VF aVF = new VF();
+ List<VFModule> vfModuleList = new ArrayList<VFModule>();
+ assertEquals(vfModuleList.size(), 0);
+ VFModule vfModule = new VFModule();
+ vfModule.setInvariantUuid("Invariant Uuid");
+ vfModule.setMaxInstances(10);
+ vfModule.setMinInstances(1);
+ vfModule.setUuid("Uuid");
+ vfModuleList.add(vfModule);
+ aVF.setVfModules(vfModuleList);
+ assertEquals(vfModuleList.size(), 1);
+ }
+
+ @Test
+ public void testAddVfModule() {
+ VF aVF = new VF();
+ List<VFModule> vfModuleList = new ArrayList<VFModule>();
+ assertEquals(vfModuleList.size(), 0);
+ VFModule vfModule = new VFModule();
+ vfModule.setInvariantUuid("Invariant Uuid");
+ vfModule.setMaxInstances(10);
+ vfModule.setMinInstances(1);
+ vfModule.setUuid("Uuid");
+ vfModuleList.add(vfModule);
+ aVF.addVfModule(vfModule);
+ assertEquals(vfModuleList.size(), 1);
+ }
+
+ @Test
+ public void testGetVfModules() {
+ VF aVF = new VF();
+ List<VFModule> vfModuleList = new ArrayList<VFModule>();
+ assertEquals(vfModuleList.size(), 0);
+ VFModule vfModule = new VFModule();
+ vfModule.setInvariantUuid("Invariant Uuid");
+ vfModule.setMaxInstances(10);
+ vfModule.setMinInstances(1);
+ vfModule.setUuid("Uuid");
+ vfModuleList.add(vfModule);
+ aVF.addVfModule(vfModule);
+ List<VFModule> resultVFModules = aVF.getVfModules();
+ assertTrue("VF Modules doesn't match",
+ ((VFModule) resultVFModules.get(0)).getInvariantUuid().equals("Invariant Uuid"));
+ }
+
+ @Test
+ public void testSetVnfc() {
+ VF aVF = new VF();
+ List<VNFC> vnfcList = new ArrayList<VNFC>();
+ assertEquals(vnfcList.size(), 0);
+ VNFC aVNFC = new VNFC();
+ aVNFC.setName("VNFC name");
+ vnfcList.add(aVNFC);
+ aVF.setVnfc(vnfcList);
+ assertTrue("VNFC list item doesn't match", aVF.getVnfc().get(0).getName().equals("VNFC name"));
+ }
+
+ @Test
+ public void testAddVnfc() {
+ VF aVF = new VF();
+ assertEquals(aVF.getVnfc().size(), 0);
+ VNFC aVNFC = new VNFC();
+ aVNFC.setName("VNFC name");
+ aVF.addVnfc(aVNFC);
+ assertTrue("VNFC list item doesn't match", aVF.getVnfc().get(0).getName().equals("VNFC name"));
+ }
+}
diff --git a/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java b/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java new file mode 100644 index 0000000..b1c1285 --- /dev/null +++ b/src/test/java/org/onap/pomba/common/datatypes/VnfcTests.java @@ -0,0 +1,37 @@ +/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=====================================================
+ */
+package org.onap.pomba.common.datatypes;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class VnfcTests {
+ @Test
+ public void testVNFC() {
+ VNFC aVNFC = new VNFC();
+ aVNFC.setName("VNFC name");
+ aVNFC.setInvariantUuid("Invariant Uuid");
+ aVNFC.setUuid("Uuid");
+ aVNFC.setNfcNamingCode("NFC Naming Code");
+ 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"));
+ }
+}
diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..cdcd1e9 --- /dev/null +++ b/version.properties @@ -0,0 +1,13 @@ +# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+
+major=1
+minor=0
+patch=0
+
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
|