Change BGP to use bgp-id type and as-number type

[bgpcep.git] / bgp / openconfig-spi / src / main / java / org / opendaylight / protocol / bgp / openconfig / spi / pojo / BGPRibInstanceConfiguration.java

diff --git a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/pojo/BGPRibInstanceConfiguration.java b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/pojo/BGPRibInstanceConfiguration.java
index e4e24a6a1775910e4d5f8bd29126da5e71345390..a3b00e454d443fa36b95d26449da5a07b4ad9687 100644 (file)
--- a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/pojo/BGPRibInstanceConfiguration.java
+++ b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/pojo/BGPRibInstanceConfiguration.java
@@ -15,9 +15,10 @@ import java.util.Map;
 import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode;
 import org.opendaylight.protocol.bgp.openconfig.spi.InstanceConfigurationIdentifier;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier;
 
 /**
  * POJO for holding BGP RIB module instance configuration
@@ -26,13 +27,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.
 public final class BGPRibInstanceConfiguration extends AbstractInstanceConfiguration {
 
     private final AsNumber localAs;
-    private final Ipv4Address bgpRibId;
-    private final Ipv4Address clusterId;
+    private final BgpId bgpRibId;
+    private final ClusterIdentifier clusterId;
     private final List<BgpTableType> tableTypes;
     private final Map<TablesKey, PathSelectionMode> pathSelectionModes;
 
-    public BGPRibInstanceConfiguration(final InstanceConfigurationIdentifier identifier, final AsNumber localAs, final Ipv4Address bgpRibId,
-            final Ipv4Address clusterId, final List<BgpTableType> tableTypes, final Map<TablesKey, PathSelectionMode> pathSelectionModes) {
+    public BGPRibInstanceConfiguration(final InstanceConfigurationIdentifier identifier, final AsNumber localAs, final BgpId bgpRibId,
+            final ClusterIdentifier clusterId, final List<BgpTableType> tableTypes, final Map<TablesKey, PathSelectionMode> pathSelectionModes) {
         super(identifier);
         this.pathSelectionModes = pathSelectionModes;
         this.localAs = Preconditions.checkNotNull(localAs);
@@ -45,11 +46,11 @@ public final class BGPRibInstanceConfiguration extends AbstractInstanceConfigura
         return localAs;
     }
 
-    public Ipv4Address getBgpRibId() {
+    public BgpId getBgpRibId() {
         return bgpRibId;
     }
 
-    public Optional<Ipv4Address> getClusterId() {
+    public Optional<ClusterIdentifier> getClusterId() {
         return Optional.fromNullable(clusterId);
     }