Identify topology reference as such

Change-Id: I887784f3189d96eae7e834b37c324e40e274b9a5
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang b/pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang
index 06c69c93e9dc7b20ccb96ab74b95b571f21718f6..a326531f7ecec689f7a181d03ba17fc554502336 100644 (file)
--- a/pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang
+++ b/pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang
@@ -32,7 +32,7 @@ module config-pcep-topology-provider {
             "Initial revision";
     }
 
-    identity pcep-topology {
+    identity pcep-topology-reference {
         description
             "Service representing a PCEP-enabled topology.";
 
@@ -41,15 +41,15 @@ module config-pcep-topology-provider {
         config:java-class "org.opendaylight.bgpcep.topology.TopologyReference";
     }
 
-    identity pcep-topology-impl {
+    identity pcep-topology-provider {
         base config:module-type;
-        config:provided-service pcep-topology;
+        config:provided-service pcep-topology-reference;
         config:java-name-prefix PCEPTopologyProvider;
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case pcep-topology-impl {
-            when "/config:modules/config:module/config:type = 'pcep-topology-impl'";
+        case pcep-topology-provider {
+            when "/config:modules/config:module/config:type = 'pcep-topology-provider'";
 
             container data-provider {
                 uses config:service-ref {
@@ -93,16 +93,14 @@ module config-pcep-topology-provider {
             }
 
             leaf listen-address {
-            // FIXME: change to inet:ip-address
+                // FIXME: change to inet:ip-address
                 type inet:ipv4-address;
-//                default "0.0.0.0";
-                mandatory true;
+                default "0.0.0.0";
             }
 
             leaf listen-port {
                 type inet:port-number;
-//                default 4189;
-                mandatory true;
+                default 4189;
             }
         }
     }

diff --git a/pcep/tunnel-provider-config/pom.xml b/pcep/tunnel-provider-config/pom.xml
index 12bdf53632ff00ea1e16762855e4958931c582fe..04134b55cf76ffc6ab5957ad8963d271907ec256 100644 (file)
--- a/pcep/tunnel-provider-config/pom.xml
+++ b/pcep/tunnel-provider-config/pom.xml
@@ -64,7 +64,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang b/pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang
index d85b364eab4fa65cd64005003b5d270fb3f3ca09..38b0674d4b48073facdb1315b05022c23445935b 100644 (file)
--- a/pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang
+++ b/pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang
@@ -32,7 +32,7 @@ module config-pcep-tunnel-provider {
             "Initial revision";
     }
 
-    identity pcep-tunnel-topology {
+    identity pcep-tunnel-topology-reference {
         description
             "Service representing a PCEP-enabled tunnel topology.";
 
@@ -40,15 +40,15 @@ module config-pcep-tunnel-provider {
         config:java-class "org.opendaylight.bgpcep.topology.TopologyReference";
     }
 
-    identity pcep-tunnel-topology-impl {
+    identity pcep-tunnel-topology-provider {
         base config:module-type;
-        config:provided-service pcep-tunnel-topology;
+        config:provided-service pcep-tunnel-topology-reference;
         config:java-name-prefix PCEPTunnelTopologyProvider;
     }
 
     augment "/config:modules/config:module/config:configuration" {
-        case pcep-tunnel-topology-impl {
-            when "/config:modules/config:module/config:type = 'pcep-tunnel-topology-impl'";
+        case pcep-tunnel-topology-provider {
+            when "/config:modules/config:module/config:type = 'pcep-tunnel-topology-provider'";
 
             container data-provider {
                 uses config:service-ref {
@@ -81,7 +81,7 @@ module config-pcep-tunnel-provider {
                 uses config:service-ref {
                     refine type {
                         mandatory true;
-                        config:required-identity pceptopo:pcep-topology;
+                        config:required-identity pceptopo:pcep-topology-reference;
                     }
                 }
             }