compliant attribute name and getter setters

compliant attribute name (to match regex) for ContrailSubnet, ContrailSubnetHostRoutes

Issue-ID: SO-1490

Change-Id: Ia78adc1356609b44426b5f692e205166bb80d665
Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnet.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnet.java
index 0c55bd6..25667ef 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnet.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnet.java
@@ -66,7 +66,7 @@ public class ContrailSubnet {
     private List<ContrailSubnetPool> allocationPools = new ArrayList<>();
 
     @JsonProperty("network_ipam_refs_data_ipam_subnets_host_routes")
-    private final ContrailSubnetHostRoutes host_routes = new ContrailSubnetHostRoutes();
+    private final ContrailSubnetHostRoutes hostRoutes = new ContrailSubnetHostRoutes();
 
     public ContrailSubnet() {
         super();
@@ -173,7 +173,7 @@ public class ContrailSubnet {
                 }
             }
             if (inputSubnet.getHostRoutes() != null) {
-                List<ContrailSubnetHostRoute> hrList = host_routes.getHost_routes();
+                List<ContrailSubnetHostRoute> hrList = hostRoutes.getHostRoutes();
                 for (HostRoute hr : inputSubnet.getHostRoutes()) {
                     if (!msoCommonUtils.isNullOrEmpty(hr.getPrefix())
                             || !msoCommonUtils.isNullOrEmpty(hr.getNextHop())) {

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnetHostRoutes.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnetHostRoutes.java
index b1908d9..0802194 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnetHostRoutes.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/ContrailSubnetHostRoutes.java
@@ -33,12 +33,12 @@ public class ContrailSubnetHostRoutes {
 
     public ContrailSubnetHostRoutes() {}
 
-    public List<ContrailSubnetHostRoute> getHost_routes() {
+    public List<ContrailSubnetHostRoute> getHostRoutes() {
         return hostRoutes;
     }
 
-    public void setHost_routes(List<ContrailSubnetHostRoute> host_routes) {
-        this.hostRoutes = host_routes;
+    public void setHostRoutes(List<ContrailSubnetHostRoute> hostRoutes) {
+        this.hostRoutes = hostRoutes;
     }
 
     @Override

diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/ContrailSubnetHostRoutesTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/ContrailSubnetHostRoutesTest.java
index eb8912f..830d94c 100644 (file)
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/ContrailSubnetHostRoutesTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/network/ContrailSubnetHostRoutesTest.java
@@ -27,8 +27,8 @@ public class ContrailSubnetHostRoutesTest {
 
     @Test
     public void testContrailSubnetHostRoutes() {
-        cshr.setHost_routes(host_routes);
-        assertEquals(cshr.getHost_routes(), host_routes);
+        cshr.setHostRoutes(host_routes);
+        assertEquals(cshr.getHostRoutes(), host_routes);
         assert (cshr.toString() != null);
     }
 }