Initially missed this but this patch fixes the initial config
xml file. Also, this code contains a fix for an issue with
filtering paths that CODEC could not handle and were reconstructed.
Change-Id: I34da4ce9e78c075439b0047407c75aa0b86feb16
Signed-off-by: Josh <jhershbe@redhat.com>
<propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
</plugin>
<propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/classes/initial/mdsaltrace_config.xml</file>
+ <type>xml</type>
+ <classifier>config</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
</plugins>
</build>
</project>
--- /dev/null
+<config xmlns="urn:opendaylight:params:xml:ns:yang:mdsaltrace">
+ <!-- <registration-watches>/neutron-router-dpns/router-dpn-list</registration-watches> -->
+ <!-- <registration-watches>/tunnels_state/state-tunnel-list</registration-watches> -->
+ <!-- <write-watches> /NetworkTopology/Topology</write-watches> -->
+</config>
* <classifier>features</classifier>
* <type>xml</type>
* <scope>runtime</scope>
* <classifier>features</classifier>
* <type>xml</type>
* <scope>runtime</scope>
- * <version>0.1.5-SNAPSHOT</version>
+ * <version>0.1.6-SNAPSHOT</version>
* </dependency>
* }
* </pre>
* </dependency>
* }
* </pre>
}
private boolean isParent(String parent, String child) {
}
private boolean isParent(String parent, String child) {
- return child.startsWith(parent);
+ int parentOffset = 0;
+ if (parent.length() > 0 && parent.charAt(0) == '<') {
+ parentOffset = parent.indexOf('>') + 1;
+ }
+
+ int childOffset = 0;
+ if (child.length() > 0 && child.charAt(0) == '<') {
+ childOffset = child.indexOf('>') + 1;
+ }
+
+ return child.startsWith(parent.substring(parentOffset), childOffset);
}
public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store,
}
public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store,
}
String otherIidString = toIidCompString(iid);
}
String otherIidString = toIidCompString(iid);
switch (scope) {
case BASE:
return isParent(iidString, otherIidString);
switch (scope) {
case BASE:
return isParent(iidString, otherIidString);
* @param store Which LogicalDataStore? or null for both
*/
public void watchRegistrations(String iidString, LogicalDatastoreType store) {
* @param store Which LogicalDataStore? or null for both
*/
public void watchRegistrations(String iidString, LogicalDatastoreType store) {
+ LOG.info("Watching registrations to {} in {}", iidString, store);
registrationWatches.add(new Watch(iidString, store));
}
registrationWatches.add(new Watch(iidString, store));
}
* @param store Which LogicalDataStore? or null for both
*/
public void watchWrites(String iidString, LogicalDatastoreType store) {
* @param store Which LogicalDataStore? or null for both
*/
public void watchWrites(String iidString, LogicalDatastoreType store) {
+ LOG.info("Watching writes to {} in {}", iidString, store);
Watch watch = new Watch(iidString, store);
writeWatches.add(watch);
}
Watch watch = new Watch(iidString, store);
writeWatches.add(watch);
}
}
private void reconstructIidPathString(YangInstanceIdentifier yiid, StringBuilder sb) {
}
private void reconstructIidPathString(YangInstanceIdentifier yiid, StringBuilder sb) {
- sb.append("RECONSTRUCTED: ");
+ sb.append("<RECONSTRUCTED FROM: \"").append(yiid.toString()).append("\">");
for (YangInstanceIdentifier.PathArgument pathArg : yiid.getPathArguments()) {
if (pathArg instanceof YangInstanceIdentifier.AugmentationIdentifier) {
sb.append('/').append("AUGMENTATION");
for (YangInstanceIdentifier.PathArgument pathArg : yiid.getPathArguments()) {
if (pathArg instanceof YangInstanceIdentifier.AugmentationIdentifier) {
sb.append('/').append("AUGMENTATION");
}
sb.append('/').append(pathArg.getNodeType().getLocalName());
}
}
sb.append('/').append(pathArg.getNodeType().getLocalName());
}
- sb.append(" ->->-> [[[ ").append(yiid.toString()).append(" ]]]");
}
String getStackSummary() {
}
String getStackSummary() {
<bundle>mvn:org.opendaylight.controller/mdsal-trace-api/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller/mdsal-trace-dom-impl/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller/mdsal-trace-binding-impl/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller/mdsal-trace-api/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller/mdsal-trace-dom-impl/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller/mdsal-trace-binding-impl/{{VERSION}}</bundle>
+ <configfile finalname="etc/opendaylight/datastore/initial/config/mdsaltrace_config.xml">mvn:org.opendaylight.controller/mdsal-trace-api/{{VERSION}}/xml/config</configfile>