summaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl/trafficgenerator
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common/model-impl/trafficgenerator')
-rw-r--r--controlloop/common/model-impl/trafficgenerator/checkstyle-suppressions.xml30
-rw-r--r--controlloop/common/model-impl/trafficgenerator/pom.xml3
-rw-r--r--controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgRequest.java (renamed from controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGRequest.java)8
-rw-r--r--controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStream.java (renamed from controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStream.java)6
-rw-r--r--controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStreams.java (renamed from controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStreams.java)8
-rw-r--r--controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java16
6 files changed, 20 insertions, 51 deletions
diff --git a/controlloop/common/model-impl/trafficgenerator/checkstyle-suppressions.xml b/controlloop/common/model-impl/trafficgenerator/checkstyle-suppressions.xml
deleted file mode 100644
index 57d62196f..000000000
--- a/controlloop/common/model-impl/trafficgenerator/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2018 AT&T Technologies. All rights reserved.
- ================================================================================
- 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.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<suppressions>
- <suppress checks="AbbreviationAsWordInName"
- files="PGRequest.java|PGStream.java|PGStreams.java"
- lines="1-9999"/>
-</suppressions>
diff --git a/controlloop/common/model-impl/trafficgenerator/pom.xml b/controlloop/common/model-impl/trafficgenerator/pom.xml
index 7fd59ea48..922da378f 100644
--- a/controlloop/common/model-impl/trafficgenerator/pom.xml
+++ b/controlloop/common/model-impl/trafficgenerator/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
Drools PDP Application Models
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -65,7 +65,6 @@
<includeTestResources>true</includeTestResources>
<excludes>
</excludes>
- <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
<consoleOutput>true</consoleOutput>
<failsOnViolation>true</failsOnViolation>
<violationSeverity>warning</violationSeverity>
diff --git a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGRequest.java b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgRequest.java
index f4571d68c..026d7d9cc 100644
--- a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGRequest.java
+++ b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgRequest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* trafficgenerator
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,14 +24,14 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
-public class PGRequest implements Serializable {
+public class PgRequest implements Serializable {
private static final long serialVersionUID = -3283942659786236032L;
@SerializedName("pg-streams")
- public PGStreams pgStreams;
+ public PgStreams pgStreams;
- public PGRequest() {
+ public PgRequest() {
//required by author
}
}
diff --git a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStream.java b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStream.java
index dad77e886..499d20f96 100644
--- a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStream.java
+++ b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStream.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* trafficgenerator
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
-public class PGStream implements Serializable {
+public class PgStream implements Serializable {
private static final long serialVersionUID = 5567635677419358210L;
@@ -33,7 +33,7 @@ public class PGStream implements Serializable {
@SerializedName("is-enabled")
public String isEnabled;
- public PGStream() {
+ public PgStream() {
//required by author
}
}
diff --git a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStreams.java b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStreams.java
index 06117b9a3..566a9eed0 100644
--- a/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PGStreams.java
+++ b/controlloop/common/model-impl/trafficgenerator/src/main/java/org/onap/policy/vnf/trafficgenerator/PgStreams.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* trafficgenerator
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@ import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
-public class PGStreams implements Serializable {
+public class PgStreams implements Serializable {
private static final long serialVersionUID = 5567635677419358210L;
@SerializedName("pg-stream")
- public List<PGStream> pgStream = new LinkedList<>();
+ public List<PgStream> pgStream = new LinkedList<>();
- public PGStreams() {
+ public PgStreams() {
// required by author
}
}
diff --git a/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java b/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java
index bd59f8bc1..963bf0b99 100644
--- a/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java
+++ b/controlloop/common/model-impl/trafficgenerator/src/test/java/org/onap/policy/vnf/trafficgenerator/DemoTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* trafficgenerator
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ package org.onap.policy.vnf.trafficgenerator;
import org.junit.Test;
-import org.onap.policy.vnf.trafficgenerator.PGRequest;
-import org.onap.policy.vnf.trafficgenerator.PGStream;
-import org.onap.policy.vnf.trafficgenerator.PGStreams;
+import org.onap.policy.vnf.trafficgenerator.PgRequest;
+import org.onap.policy.vnf.trafficgenerator.PgStream;
+import org.onap.policy.vnf.trafficgenerator.PgStreams;
import org.onap.policy.vnf.trafficgenerator.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,12 +34,12 @@ public class DemoTest {
@Test
public void test() {
- PGRequest request = new PGRequest();
- request.pgStreams = new PGStreams();
+ PgRequest request = new PgRequest();
+ request.pgStreams = new PgStreams();
- PGStream pgStream;
+ PgStream pgStream;
for (int i = 0; i < 5; i++) {
- pgStream = new PGStream();
+ pgStream = new PgStream();
pgStream.streamId = "fw_udp" + (i + 1);
pgStream.isEnabled = "true";
request.pgStreams.pgStream.add(pgStream);