Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 211 - Fixed codec generation when transitive dependencies (parents) are...
[controller.git]
/
opendaylight
/
config
/
yang-jmx-generator
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
yangjmxgenerator
/
ModuleMXBeanEntryNameConflictTest.java
diff --git
a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java
b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java
index deef08a292e6d5a7853796effeaa85fc5096773e..9032a2c9306ca38f537028984f05812ca24f6e2a 100644
(file)
--- a/
opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java
+++ b/
opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/ModuleMXBeanEntryNameConflictTest.java
@@
-100,6
+100,9
@@
public class ModuleMXBeanEntryNameConflictTest extends AbstractYangTest {
testedYangModulesToExpectedConflictingName.put(
"config-test-runtime-bean-name-conflict2",
"StateARuntimeMXBean");
testedYangModulesToExpectedConflictingName.put(
"config-test-runtime-bean-name-conflict2",
"StateARuntimeMXBean");
+ testedYangModulesToExpectedConflictingName.put(
+ "config-test-duplicate-attribute-in-runtime-and-mxbean",
+ "port");
}
private String getYangModuleName(String name) {
}
private String getYangModuleName(String name) {