Fixing poms and other xmls
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7c20b120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7c20b120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7c20b120 Branch: refs/heads/cisco-vnmc-api-integration Commit: 7c20b120c294fec4456a7052b630207eb0383458 Parents: ee86875 Author: Koushik Das <[email protected]> Authored: Tue Mar 12 23:31:46 2013 +0530 Committer: Koushik Das <[email protected]> Committed: Tue Mar 12 23:31:46 2013 +0530 ---------------------------------------------------------------------- client/pom.xml | 5 ++ client/tomcatconf/commands.properties.in | 10 +++ client/tomcatconf/components-nonoss.xml.in | 67 +++++++++++---------- plugins/network-elements/cisco-vnmc/pom.xml | 12 ++++- plugins/pom.xml | 2 +- 5 files changed, 62 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c20b120/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 760923b..300e798 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -554,6 +554,11 @@ <artifactId>cloud-vmware-base</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-plugin-network-cisco-vnmc</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c20b120/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index f03e8d5..f87ab57 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -546,3 +546,13 @@ revertToSnapshot=15 #### Baremetal commands addBaremetalHost=1 + +#### Cisco Vnmc command +addCiscoVnmcResource=1 +deleteCiscoVnmcResource=1 +listCiscoVnmcResources=1 + +#### Cisco Asa1000v command +addCiscoAsa1000vResource=1 +deleteCiscoAsa1000vResource=1 +listCiscoAsa1000vResources=1 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c20b120/client/tomcatconf/components-nonoss.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components-nonoss.xml.in b/client/tomcatconf/components-nonoss.xml.in index fbfc5cc..56a2fed 100755 --- a/client/tomcatconf/components-nonoss.xml.in +++ b/client/tomcatconf/components-nonoss.xml.in @@ -45,53 +45,56 @@ under the License. <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/> <checker name="PremiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> </system-integrity-checker> - + <management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.PremiumComponentLibrary" extends="components.xml:management-server"> <adapters key="com.cloud.ha.Investigator"> - <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/> + <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/> </adapters> <adapters key="com.cloud.ha.FenceBuilder"> - <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/> + <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/> </adapters> <adapters key="com.cloud.resource.Discoverer"> - <adapter name="VShpereServer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer"/> + <adapter name="VShpereServer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer"/> </adapters> + <dao name="CiscoVnmcDao" class="com.cloud.network.dao.CiscoVnmcDaoImpl" singleton="false"/> + <dao name="CiscoAsa1000vDao" class="com.cloud.network.dao.CiscoAsa1000vDaoImpl" singleton="false"/> + <dao name="NetworkAsa1000vMapDao" class="com.cloud.network.dao.NetworkAsa1000vMapDaoImpl" singleton="false"/> + <pluggableservice name="CiscoVnmcElementService" key="com.cloud.network.element.CiscoVnmcElementService" class="com.cloud.network.element.CiscoVnmcElement"/> + <pluggableservice name="CiscoAsa1000vService" key="com.cloud.network.element.CiscoAsa1000vService" class="com.cloud.network.element.CiscoVnmcElement"/> <adapters key="com.cloud.network.element.NetworkElement"> - <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> - <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/> - <adapter name="F5BigIP" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> - <adapter name="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"/> - </adapters> - - <adapters key="com.cloud.hypervisor.HypervisorGuru"> - <adapter name="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"/> - </adapters> - - <manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/> - <manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/> - <pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/> - <pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> - <pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> - <pluggableservice name="CiscoNexusVSMElementService" key="com.cloud.network.element.CiscoNexusVSMElementService" class="com.cloud.network.element.CiscoNexusVSMElement"/> + <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> + <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/> + <adapter name="F5BigIP" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> + <adapter name="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"/> + <adapter name="CiscoVnmc" class="com.cloud.network.element.CiscoVnmcElement"/> + </adapters> + + <adapters key="com.cloud.hypervisor.HypervisorGuru"> + <adapter name="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"/> + </adapters> - <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/> - <dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/> - <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/> - <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/> - <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/> - <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> - </dao> + <manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/> + <manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/> + <pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/> + <pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> + <pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> + <pluggableservice name="CiscoNexusVSMElementService" key="com.cloud.network.element.CiscoNexusVSMElementService" class="com.cloud.network.element.CiscoNexusVSMElement"/> + + <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/> + <dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/> + <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/> + <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/> + <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/> + <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> + <param name="premium">true</param> + </dao> </management-server> <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server"> <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false"> - <param name="premium">true</param> + <param name="premium">true</param> </dao> </configuration-server> - - - </components-nonoss.xml> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c20b120/plugins/network-elements/cisco-vnmc/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml index 0a8d242..1ac6bd8 100644 --- a/plugins/network-elements/cisco-vnmc/pom.xml +++ b/plugins/network-elements/cisco-vnmc/pom.xml @@ -24,9 +24,19 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack-plugins</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <dependencies> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-plugin-hypervisor-vmware</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-vmware-base</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c20b120/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index b856cd2..c67ef3c 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -49,7 +49,6 @@ <module>network-elements/ovs</module> <module>network-elements/nicira-nvp</module> <module>network-elements/bigswitch-vns</module> - <module>network-elements/cisco-vnmc</module> <module>storage-allocators/random</module> <module>user-authenticators/ldap</module> <module>user-authenticators/md5</module> @@ -133,6 +132,7 @@ </activation> <modules> <module>hypervisors/vmware</module> + <module>network-elements/cisco-vnmc</module> </modules> </profile> <profile>
