Commits

realthargor committed 2b74270 Merge

Merge branch 'master' into junit_speedup

Comments (0)

Files changed (3)

opennms-config-tester/pom.xml

       <groupId>org.opennms</groupId>
       <artifactId>opennms-snmp-asset-provisioning-adapter</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.opennms</groupId>
+        <artifactId>opennms-vmware</artifactId>
+    </dependency>
     <!-- Non-OpenNMS dependencies -->
     <dependency>
       <groupId>commons-cli</groupId>

opennms-config-tester/src/main/resources/META-INF/opennms/applicationContext-configTester.xml

         <entry key="vulnscand-configuration.xml" value="vulnscandConfigFactory"/>
         <entry key="wmi-config.xml" value="wmiPeerFactory"/>
         <entry key="wmi-datacollection-config.xml" value="wmiDataCollectionConfigFactory"/>
+
+        <!-- VMware configuration files -->
+        <entry key="vmware-cim-datacollection-config.xml" value="VmwareCimDatacollectionConfigDao"/>
+        <entry key="vmware-datacollection-config.xml" value="VmwareDatacollectionConfigDao"/>
+        <entry key="vmware-config.xml" value="VmwareConfigDao"/>
         <entry key="xmlrpcd-configuration.xml" value="xmlrpcdConfigFactory"/>
         <!-- <entry key="xmp-config.xml" value="xmpConfigFactory"/> --><!-- Not part of standard build -->
         <!-- <entry key="xmp-datacollection-config.xml" value="xmpCollectionFactory"/> --><!-- Not part of standard build -->
 
   <bean id="wmiDataCollectionConfigFactory" class="org.opennms.netmgt.config.WmiDataCollectionConfigFactory" depends-on="wmiDataCollectionConfigFactory-init" factory-method="getInstance"/>
 
+  <!-- VMware configuration files -->
+  <bean id="VmwareCimDatacollectionConfigDao" class="org.opennms.netmgt.dao.jaxb.VmwareCimDatacollectionConfigDaoJaxb">
+    <property name="configResource" value="file:${opennms.home}/etc/vmware-cim-datacollection-config.xml"/>
+  </bean>
+
+  <bean id="VmwareDatacollectionConfigDao" class="org.opennms.netmgt.dao.jaxb.VmwareDatacollectionConfigDaoJaxb">
+    <property name="configResource" value="file:${opennms.home}/etc/vmware-datacollection-config.xml"/>
+  </bean>
+
+  <bean id="VmwareConfigDao" class="org.opennms.netmgt.dao.jaxb.VmwareConfigDaoJaxb">
+    <property name="configResource" value="file:${opennms.home}/etc/vmware-config.xml"/>
+  </bean>
+
   <bean id="xmlrpcdConfigFactory-init" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     <property name="staticMethod"><value>org.opennms.netmgt.config.XmlrpcdConfigFactory.init</value></property>
   </bean>

opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java

         testConfigFile("xmlrpcd-configuration.xml");
     }
 
-	@Test
+
+    @Test
+    public void testVMwareCimDatacollectionConfig() {
+        testConfigFile("vmware-cim-datacollection-config.xml");
+    }
+
+    @Test
+    public void testVMwareConfigConfig() {
+        testConfigFile("vmware-config.xml");
+    }
+
+    @Test
+    public void testVMwareDatacollectionConfig() {
+        testConfigFile("vmware-datacollection-config.xml");
+    }
+
+    @Test
 	@Ignore
     public void testXmpConfig() {
         testConfigFile("xmp-config.xml");
     public void testRemoteRepositoyConfig() {
 	    ignoreConfigFile("remote-repository.xml");
     }
-    
-	
+
 	@Test
 	public void testAllConfigs() {
 		ConfigTester.main(new String[] { "-a" });