fix unit test failures from changed convertion behavior

OpenNMS · Mar 31, 2014 · da14ec9 · da14ec9
1 parent f30945a
commit da14ec9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ms/netmgt/config/internal/collection/ConvertOldDataCollectionToNewDataCollectionTest.java b/...ms/netmgt/config/internal/collection/ConvertOldDataCollectionToNewDataCollectionTest.java
@@ -31,7 +31,7 @@ public void testImportEmpty() {
 
         final String expected = "<datacollection-config>\n" + 
                 "    <snmp-collection name=\"default\">\n" + 
-                "        <datacollection-group name=\"all\">\n" +
+                "        <datacollection-group name=\"default-all\">\n" +
                 "            <resourceType name=\"ifIndex\" label=\"Interfaces (MIB-2 ifTable)\">\n" + 
                 "                <resourceName><template>${ifDescr}-${ifPhysAddr}</template></resourceName>\n" + 
                 "                <resourceLabel><template>${ifDescr}-${ifPhysAddr}</template></resourceLabel>\n" + 

diff --git a/...esources/org/opennms/netmgt/config/internal/collection/new-datacollection-config-mib2.xml b/...esources/org/opennms/netmgt/config/internal/collection/new-datacollection-config-mib2.xml
@@ -5,7 +5,7 @@
     <include-collection dataCollectionGroup="Asterisk"/>
     <include-collection dataCollectionGroup="Cisco"/>
 
-    <datacollection-group name="all">
+    <datacollection-group name="default-all">
 
       <resourceType name="ifIndex" label="Interfaces (MIB-2 ifTable)">
         <resourceName><template>${ifDescr}-${ifPhysAddr}</template></resourceName>