CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis (rebase fixups)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8bb09901 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8bb09901 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8bb09901 Branch: refs/heads/qemu-img Commit: 8bb09901442d79a7dddf33465bedaccb62190952 Parents: 1621672 Author: Kelven Yang <[email protected]> Authored: Tue Mar 26 14:25:52 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Fri Mar 29 11:12:36 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 78 ++++++++------- client/tomcatconf/componentContext.xml.in | 15 +++- client/tomcatconf/nonossComponentContext.xml.in | 11 ++ .../src/com/cloud/network/NetworkServiceImpl.java | 4 + 4 files changed, 72 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb09901/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 608ffc4..3c93b8a 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -177,8 +177,6 @@ <bean id="autoScaleVmGroupDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupDaoImpl" /> <bean id="autoScaleVmGroupPolicyMapDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupPolicyMapDaoImpl" /> <bean id="autoScaleVmProfileDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmProfileDaoImpl" /> - <bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" /> - <bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" /> <bean id="capacityDaoImpl" class="com.cloud.capacity.dao.CapacityDaoImpl" /> <bean id="certificateDaoImpl" class="com.cloud.certificate.dao.CertificateDaoImpl" /> <bean id="clusterDaoImpl" class="com.cloud.dc.dao.ClusterDaoImpl" /> @@ -382,15 +380,6 @@ <bean id="Ovs" class="com.cloud.network.element.OvsElement"> <property name="name" value="Ovs"/> </bean> - <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> - <property name="name" value="BareMetalDhcp"/> - </bean> - <bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement"> - <property name="name" value="BareMetalPxe"/> - </bean> - <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement"> - <property name="name" value="BareMetalUserdata"/> - </bean> <bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement"> <property name="name" value="SecurityGroupProvider"/> </bean> @@ -455,7 +444,6 @@ <property name="name" value="Basic"/> </bean> - <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" /> <bean id="hyervisorTemplateAdapter" class="com.cloud.template.HyervisorTemplateAdapter" /> <bean id="clusterAlertAdapter" class="com.cloud.alert.ClusterAlertAdapter" /> <bean id="consoleProxyAlertAdapter" class="com.cloud.alert.ConsoleProxyAlertAdapter" /> @@ -509,10 +497,6 @@ <property name="name" value="KVM Agent"/> </bean> - <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> - <property name="name" value="Bare Metal Agent"/> - </bean> - <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"> <property name="name" value="SCVMMServer"/> </bean> @@ -536,10 +520,6 @@ <property name="name" value="UserConcentratedPod"/> </bean> - <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> - <property name="name" value="BareMetal Fit"/> - </bean> - <bean id="clusterBasedAgentLoadBalancerPlanner" class="com.cloud.cluster.agentlb.ClusterBasedAgentLoadBalancerPlanner"> <property name="name" value="ClusterBasedAgentLoadBalancerPlanner"/> </bean> @@ -590,14 +570,6 @@ <property name="name" value="OvmGuru"/> </bean> - <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> - <property name="name" value="BaremetalGuru"/> - </bean> - - <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector"> - <property name="name" value="BaremetalPlannerSelector"/> - </bean> - <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector"> <property name="name" value="HypervisorPlannerSelector"/> </bean> @@ -619,12 +591,6 @@ <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/> - <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/> - <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/> - <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/> - <bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" /> - <bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" /> - <bean id="alertManagerImpl" class="com.cloud.alert.AlertManagerImpl" /> <bean id="asyncJobExecutorContextImpl" class="com.cloud.async.AsyncJobExecutorContextImpl" /> <bean id="asyncJobManagerImpl" class="com.cloud.async.AsyncJobManagerImpl" /> @@ -673,6 +639,49 @@ <bean id="vpcVirtualNetworkApplianceManagerImpl" class="com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl" /> <!-- + Baremetal components + --> +<!-- + <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> + <property name="name" value="BareMetalDhcp"/> + </bean> + <bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement"> + <property name="name" value="BareMetalPxe"/> + </bean> + <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement"> + <property name="name" value="BareMetalUserdata"/> + </bean> + + <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" /> + + <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> + <property name="name" value="Bare Metal Agent"/> + </bean> + + <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> + <property name="name" value="BareMetal Fit"/> + </bean> + + <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> + <property name="name" value="BaremetalGuru"/> + </bean> + + <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector"> + <property name="name" value="BaremetalPlannerSelector"/> + </bean> + + <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/> + <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/> + <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/> + <bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" /> + <bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" /> + + <bean id="bAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" /> + <bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" /> + <bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" /> +--> + + <!-- Misc components --> <bean id="cloudZonesStartupProcessor" class="com.cloud.hypervisor.CloudZonesStartupProcessor" /> @@ -686,7 +695,6 @@ <bean id="apiResponseHelper" class="com.cloud.api.ApiResponseHelper" /> <bean id="apiServer" class="com.cloud.api.ApiServer" /> <bean id="apiServlet" class="com.cloud.api.ApiServlet" /> - <bean id="bAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" /> <bean id="cloudOrchestrator" class="org.apache.cloudstack.platform.orchestration.CloudOrchestrator" /> <bean id="clusterRestService" class="org.apache.cloudstack.engine.rest.service.api.ClusterRestService" /> <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb09901/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 159bf85..a6bd420 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -33,7 +33,6 @@ <!-- OSS deployment component configuration --> - <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> <bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl" /> @@ -103,7 +102,11 @@ <ref bean="XcpServerDiscoverer"/> <ref bean="SecondaryStorageDiscoverer"/> <ref bean="KvmServerDiscoverer"/> + + <!-- <ref bean="BareMetalDiscoverer"/> + --> + <ref bean="OvmDiscoverer"/> </list> </property> @@ -138,7 +141,11 @@ <ref bean="FirstFitPlanner" /> <ref bean="UserDispersingPlanner" /> <ref bean="UserConcentratedPodPlanner" /> + +<!-- <ref bean="BareMetalPlanner" /> +--> + </list> </property> </bean> @@ -163,9 +170,11 @@ <ref bean="Ovs"/> <ref bean="SecurityGroupProvider"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> +--> </list> </property> <property name="IpDeployers"> @@ -179,7 +188,9 @@ <list> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> +--> </list> </property> </bean> @@ -191,9 +202,11 @@ <ref bean="Ovs"/> <ref bean="SecurityGroupProvider"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> +--> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb09901/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 13bb3f5..55a8f06 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -170,6 +170,7 @@ <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner"> <property name="name" value="First Fit"/> + <property name="StoragePoolAllocators"> <list> <ref bean="LocalStoragePoolAllocator"/> @@ -194,7 +195,9 @@ <ref bean="XcpServerDiscoverer"/> <ref bean="SecondaryStorageDiscoverer"/> <ref bean="KvmServerDiscoverer"/> +<!-- <ref bean="BareMetalDiscoverer"/> +--> <ref bean="OvmDiscoverer"/> <ref bean="vmwareServerDiscoverer"/> </list> @@ -232,7 +235,9 @@ <ref bean="FirstFitPlanner" /> <ref bean="UserDispersingPlanner" /> <ref bean="UserConcentratedPodPlanner" /> +<!-- <ref bean="BareMetalPlanner" /> +--> </list> </property> </bean> @@ -262,9 +267,11 @@ <ref bean="Ovs"/> <ref bean="SecurityGroupProvider"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> +--> </list> </property> <property name="IpDeployers"> @@ -278,7 +285,9 @@ <list> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> +--> </list> </property> </bean> @@ -295,9 +304,11 @@ <ref bean="Ovs"/> <ref bean="SecurityGroupProvider"/> <ref bean="VpcVirtualRouter"/> +<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> +--> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb09901/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 130cb1b..846d79e 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3081,9 +3081,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId); DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId()); if (dvo.getNetworkType() == NetworkType.Basic) { + + // Baremetal is currently disabled +/* addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetaUserdataProvider", null, null); +*/ } return null; }
