summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java53
-rw-r--r--zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java6
-rw-r--r--zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/entity/FlowClassfierReq4NTest.java51
3 files changed, 56 insertions, 54 deletions
diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
index 7d1f180..31bc773 100644
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2016 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.onap.sfc.entity;
public class FlowClassfierReq4N {
@@ -21,11 +22,11 @@ public class FlowClassfierReq4N {
private String name;
private String description;
private int dscp;
- private String ip_proto;
- private String source_port_range;
- private String dest_port_range;
- private String source_ip_range;
- private String dest_ip_range;
+ private String ipProto;
+ private String sourcePortRange;
+ private String destPortRange;
+ private String sourceIpRange;
+ private String destIpRange;
public String getUrl() {
return url;
@@ -67,43 +68,43 @@ public class FlowClassfierReq4N {
this.dscp = dscp;
}
- public String getIp_proto() {
- return ip_proto;
+ public String getIpProto() {
+ return ipProto;
}
- public void setIp_proto(String ip_proto) {
- this.ip_proto = ip_proto;
+ public void setIpProto(String ipProto) {
+ this.ipProto = ipProto;
}
- public String getSource_port_range() {
- return source_port_range;
+ public String getSourcePortRange() {
+ return sourcePortRange;
}
- public void setSource_port_range(String source_port_range) {
- this.source_port_range = source_port_range;
+ public void setSourcePortRange(String sourcePortRange) {
+ this.sourcePortRange = sourcePortRange;
}
- public String getDest_port_range() {
- return dest_port_range;
+ public String getDestPortRange() {
+ return destPortRange;
}
- public void setDest_port_range(String dest_port_range) {
- this.dest_port_range = dest_port_range;
+ public void setDestPortRange(String destPortRange) {
+ this.destPortRange = destPortRange;
}
- public String getSource_ip_range() {
- return source_ip_range;
+ public String getSourceIpRange() {
+ return sourceIpRange;
}
- public void setSource_ip_range(String source_ip_range) {
- this.source_ip_range = source_ip_range;
+ public void setSourceIpRange(String sourceIpRange) {
+ this.sourceIpRange = sourceIpRange;
}
- public String getDest_ip_range() {
- return dest_ip_range;
+ public String getDestIpRange() {
+ return destIpRange;
}
- public void setDest_ip_range(String dest_ip_range) {
- this.dest_ip_range = dest_ip_range;
+ public void setDestIpRange(String destIpRange) {
+ this.destIpRange = destIpRange;
}
}
diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
index e378aba..8c9ccbd 100644
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
@@ -66,7 +66,7 @@ public class N2sReqWrapper {
public static FlowClassifierReq4S convertFlowClassfier(FlowClassfierReq4N flowClassfierReq4N) {
ArrayList<FlowClassfierReq> flowClassifiers = new ArrayList();
FlowClassfierReq flowClassfierReq = new FlowClassfierReq();
- flowClassfierReq.setProtocol(flowClassfierReq4N.getIp_proto());
+ flowClassfierReq.setProtocol(flowClassfierReq4N.getIpProto());
// flowClassfierReq.setSourcePortRangeMin(Integer.parseInt(flowClassfierReq4N.
// getSource_port_range().split(",")[0]));
// flowClassfierReq.setSourcePortRangeMax(Integer.parseInt(flowClassfierReq4N.
@@ -75,8 +75,8 @@ public class N2sReqWrapper {
// flowClassfierReq4N.getDest_port_range().split(",")[0]));
// flowClassfierReq.setDestinationPortRangeMax(Integer.parseInt(
// flowClassfierReq4N.getDest_port_range().split(",")[1]));
- flowClassfierReq.setDestinationIpRange(flowClassfierReq4N.getDest_ip_range());
- flowClassfierReq.setSrcIpRange(flowClassfierReq4N.getSource_ip_range());
+ flowClassfierReq.setDestinationIpRange(flowClassfierReq4N.getDestIpRange());
+ flowClassfierReq.setSrcIpRange(flowClassfierReq4N.getSourceIpRange());
flowClassfierReq.setIpDscp(flowClassfierReq4N.getDscp());
flowClassfierReq.setUuid(SfcDriverUtil.generateUuid());
flowClassifiers.add(flowClassfierReq);
diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/entity/FlowClassfierReq4NTest.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/entity/FlowClassfierReq4NTest.java
index 3d48c41..bcbeacd 100644
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/entity/FlowClassfierReq4NTest.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/entity/FlowClassfierReq4NTest.java
@@ -1,18 +1,19 @@
-/**
+/*
* Copyright 2018 ZTE Corporation.
- * <p>
+ *
* 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
- * <p>
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
* 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.
*/
+
package org.onap.sfc.entity;
import org.junit.Before;
@@ -64,38 +65,38 @@ public class FlowClassfierReq4NTest {
}
@Test
- public void getAndSetIp_proto() throws Exception {
- String ip_proto = "ISIS";
- flowClassfierReq4N.setIp_proto(ip_proto);
- assert flowClassfierReq4N.getIp_proto().equals(ip_proto);
+ public void getAndSetIpProto() throws Exception {
+ String ipProto = "ISIS";
+ flowClassfierReq4N.setIpProto(ipProto);
+ assert flowClassfierReq4N.getIpProto().equals(ipProto);
}
@Test
- public void getAndSetSource_port_range() throws Exception {
- String source_port_range = "1-400";
- flowClassfierReq4N.setSource_port_range(source_port_range);
- assert flowClassfierReq4N.getSource_port_range().equals(source_port_range);
+ public void getAndSetSourcePortRange() throws Exception {
+ String sourcePortRange = "1-400";
+ flowClassfierReq4N.setSourcePortRange(sourcePortRange);
+ assert flowClassfierReq4N.getSourcePortRange().equals(sourcePortRange);
}
@Test
- public void getAndSetDest_port_range() throws Exception {
- String dest_port_range = "1-400";
- flowClassfierReq4N.setDest_port_range(dest_port_range);
- assert flowClassfierReq4N.getDest_port_range().equals(dest_port_range);
+ public void getAndSetDestPortRange() throws Exception {
+ String destPortRange = "1-400";
+ flowClassfierReq4N.setDestPortRange(destPortRange);
+ assert flowClassfierReq4N.getDestPortRange().equals(destPortRange);
}
@Test
- public void getAndSetSource_ip_range() throws Exception {
- String source_ip_range = "0.0.0.0-1.1.1.1";
- flowClassfierReq4N.setSource_ip_range(source_ip_range);
- assert flowClassfierReq4N.getSource_ip_range().equals(source_ip_range);
+ public void getAndSetSourceIpRange() throws Exception {
+ String sourceIpRange = "0.0.0.0-1.1.1.1";
+ flowClassfierReq4N.setSourceIpRange(sourceIpRange);
+ assert flowClassfierReq4N.getSourceIpRange().equals(sourceIpRange);
}
@Test
- public void getAndSetDest_ip_range() throws Exception {
- String dest_ip_range = "0.0.0.0-1.1.1.1";
- flowClassfierReq4N.setDest_ip_range(dest_ip_range);
- assert flowClassfierReq4N.getDest_ip_range().equals(dest_ip_range);
+ public void getAndSetDestIpRange() throws Exception {
+ String destIpRange = "0.0.0.0-1.1.1.1";
+ flowClassfierReq4N.setDestIpRange(destIpRange);
+ assert flowClassfierReq4N.getDestIpRange().equals(destIpRange);
}
-} \ No newline at end of file
+}