Added missing validations.

Change-Id: I0b794fd969423030f888acce2e2201181103a226
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv4ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv4ReachabilityTopologyBuilderModule.java
index a4c6dd514a6b83791b5ca7c91f7fb2c2b7aa24c3..0ac3b0d3a2f7c4694172e290f05d80744a955a88 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv4ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv4ReachabilityTopologyBuilderModule.java
@@ -12,6 +12,7 @@ package org.opendaylight.controller.config.yang.bgp.rib.spi;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.bgpcep.topology.provider.bgp.AbstractTopologyBuilder;
 import org.opendaylight.bgpcep.topology.provider.bgp.Ipv4ReachabilityTopologyBuilder;
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
@@ -38,7 +39,8 @@ public final class Ipv4ReachabilityTopologyBuilderModule extends org.opendayligh
        @Override
        public void validate(){
                super.validate();
-               // Add custom validation for module attributes here.
+               JmxAttributeValidationException.checkNotNull(getTopologyId(),
+                               "is not set.", topologyIdJmxAttribute);
        }
 
        @Override

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv6ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv6ReachabilityTopologyBuilderModule.java
index b6d6e2ac369f03ca64157092065095618e5694e7..ff34db66fcad1e4b71ce68b856d694a51fc484d2 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv6ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/Ipv6ReachabilityTopologyBuilderModule.java
@@ -12,6 +12,7 @@ package org.opendaylight.controller.config.yang.bgp.rib.spi;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.bgpcep.topology.provider.bgp.AbstractTopologyBuilder;
 import org.opendaylight.bgpcep.topology.provider.bgp.Ipv6ReachabilityTopologyBuilder;
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.Tables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv6AddressFamily;
@@ -37,7 +38,8 @@ public final class Ipv6ReachabilityTopologyBuilderModule extends org.opendayligh
        @Override
        public void validate(){
                super.validate();
-               // Add custom validation for module attributes here.
+               JmxAttributeValidationException.checkNotNull(getTopologyId(),
+                               "is not set.", topologyIdJmxAttribute);
        }
 
        @Override

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/LinkstateTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/LinkstateTopologyBuilderModule.java
index 7848561a409090bd8674df9671ba080c2855e946..c6c493f8140e86c546deffe989c94549335cd5bb 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/LinkstateTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/LinkstateTopologyBuilderModule.java
@@ -12,6 +12,7 @@ package org.opendaylight.controller.config.yang.bgp.rib.spi;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
 import org.opendaylight.bgpcep.topology.provider.bgp.AbstractTopologyBuilder;
 import org.opendaylight.bgpcep.topology.provider.bgp.LinkstateTopologyBuilder;
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.LinkstateAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev130918.LinkstateSubsequentAddressFamily;
@@ -38,7 +39,8 @@ public final class LinkstateTopologyBuilderModule extends org.opendaylight.contr
        @Override
        public void validate(){
                super.validate();
-               // Add custom validation for module attributes here.
+               JmxAttributeValidationException.checkNotNull(getTopologyId(),
+                               "is not set.", topologyIdJmxAttribute);
        }
 
        @Override

diff --git a/pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java b/pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java
index 53919b027529f5a0817d3adeb053a5509e318c2a..6aa323b4496e4ff0369a493d5eb8f2dbfc16abdc 100644 (file)
--- a/pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java
+++ b/pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java
@@ -14,6 +14,7 @@ import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutionException;
 
 import org.opendaylight.bgpcep.pcep.topology.provider.PCEPTopologyProvider;
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
@@ -42,7 +43,12 @@ public final class PCEPTopologyProviderModule extends org.opendaylight.controlle
        @Override
        public void validate(){
                super.validate();
-               // Add custom validation for module attributes here.
+               JmxAttributeValidationException.checkNotNull(getTopologyId(),
+                               "is not set.", topologyIdJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getListenAddress(),
+                               "is not set.", listenAddressJmxAttribute);
+               JmxAttributeValidationException.checkNotNull(getListenPort(),
+                               "is not set.", listenPortJmxAttribute);
        }
 
        private InetAddress listenAddress() {

diff --git a/pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java b/pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java
index 207350d7c8309e09efee00bad9b34c15e23f0f91..8442c92c9ccca0f78470a21a63795fa60392e86b 100644 (file)
--- a/pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java
+++ b/pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java
@@ -12,6 +12,7 @@ package org.opendaylight.controller.config.yang.pcep.tunnel.provider;
 import org.opendaylight.bgpcep.pcep.tunnel.provider.PCEPTunnelTopologyProvider;
 import org.opendaylight.bgpcep.pcep.tunnel.provider.TunnelProgramming;
 import org.opendaylight.bgpcep.topology.DefaultTopologyReference;
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.NetworkTopologyPcepService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.pcep.programming.rev131030.TopologyTunnelPcepProgrammingService;
@@ -35,7 +36,8 @@ public final class PCEPTunnelTopologyProviderModule extends org.opendaylight.con
        @Override
        public void validate(){
                super.validate();
-               // Add custom validation for module attributes here.
+               JmxAttributeValidationException.checkNotNull(getTopologyId(),
+                               "is not set.", topologyIdJmxAttribute);
        }
 
        @Override