Removing baremetal related references
Signed-off-by: Prasanna Santhanam <t...@apache.org>
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
Signed-off-by: Prasanna Santhanam <t...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99ea4011
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99ea4011
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99ea4011
Branch: refs/heads/internalLb
Commit: 99ea4011b18356d09686889205ef5df1b170b0dc
Parents: 359b931
Author: Funs Kessen <fkes...@schubergphilis.com>
Authored: Wed Mar 27 15:43:11 2013 +0530
Committer: Prasanna Santhanam <t...@apache.org>
Committed: Wed Mar 27 15:56:13 2013 +0530
----------------------------------------------------------------------
client/pom.xml | 5 -----
.../dns-notifier/resources/components-example.xml | 8 ++++++++
.../src/com/cloud/network/NetworkServiceImpl.java | 15 ++++++++++++++-
3 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99ea4011/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 7ad2eff..46ddd53 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -96,11 +96,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-ovm</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99ea4011/plugins/network-elements/dns-notifier/resources/components-example.xml
----------------------------------------------------------------------
diff --git
a/plugins/network-elements/dns-notifier/resources/components-example.xml
b/plugins/network-elements/dns-notifier/resources/components-example.xml
index 3a92a25..6493e74 100755
--- a/plugins/network-elements/dns-notifier/resources/components-example.xml
+++ b/plugins/network-elements/dns-notifier/resources/components-example.xml
@@ -112,7 +112,9 @@ under the License.
<adapter name="XCP Agent"
class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"/>
<adapter name="SecondaryStorage"
class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
<adapter name="KVM Agent"
class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"/>
+ <!--
<adapter name="Bare Metal Agent"
class="com.cloud.baremetal.BareMetalDiscoverer"/>
+ -->
<adapter name="SCVMMServer"
class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"/>
<adapter name="Ovm Discover"
class="com.cloud.ovm.hypervisor.OvmDiscoverer" />
</adapters>
@@ -120,7 +122,9 @@ under the License.
<adapter name="First Fit"
class="com.cloud.deploy.FirstFitPlanner"/>
<adapter name="UserDispersing"
class="com.cloud.deploy.UserDispersingPlanner"/>
<adapter name="UserConcentratedPod"
class="com.cloud.deploy.UserConcentratedPodPlanner"/>
+ <!--
<adapter name="BareMetal Fit"
class="com.cloud.deploy.BareMetalPlanner"/>
+ -->
</adapters>
<adapters key="com.cloud.alert.AlertAdapter">
<adapter name="ClusterAlert"
class="com.cloud.alert.ClusterAlertAdapter"/>
@@ -134,7 +138,9 @@ under the License.
<adapter name="VirtualRouter"
class="com.cloud.network.element.VirtualRouterElement"/>
<adapter name="Ovs" class="com.cloud.network.element.OvsElement"/>
<adapter name="ExternalDhcpServer"
class="com.cloud.network.element.ExternalDhcpElement"/>
+ <!--
<adapter name="BareMetal"
class="com.cloud.network.element.BareMetalElement"/>
+ -->
<adapter name="SecurityGroupProvider"
class="com.cloud.network.element.SecurityGroupElement"/>
<adapter name="VpcVirtualRouter"
class="com.cloud.network.element.VpcVirtualRouterElement"/>
<adapter name="NiciraNvp"
class="com.cloud.network.element.NiciraNvpElement"/>
@@ -146,7 +152,9 @@ under the License.
<adapters key="com.cloud.hypervisor.HypervisorGuru">
<adapter name="XenServerGuru"
class="com.cloud.hypervisor.XenServerGuru"/>
<adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/>
+ <!--
<adapter name="BareMetalGuru"
class="com.cloud.baremetal.BareMetalGuru"/>
+ -->
<adapter name="HypervGuru"
class="com.cloud.hypervisor.guru.HypervGuru"/>
<adapter name="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru" />
</adapters>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99ea4011/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 8303b0b..130cb1b 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2240,6 +2240,9 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
// add VPCVirtualRouter as the defualt network service provider
addDefaultVpcVirtualRouterToPhysicalNetwork(pNetwork.getId());
+ // add baremetal as the defualt network service provider
+ /*
addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId()); */
+
txn.commit();
return pNetwork;
} catch (Exception ex) {
@@ -3074,7 +3077,17 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
return nsp;
}
-
+ private PhysicalNetworkServiceProvider
addDefaultBaremetalProvidersToPhysicalNetwork(long physicalNetworkId) {
+ PhysicalNetworkVO pvo =
_physicalNetworkDao.findById(physicalNetworkId);
+ DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
+ if (dvo.getNetworkType() == NetworkType.Basic) {
+ addProviderToPhysicalNetwork(physicalNetworkId,
"BaremetalDhcpProvider", null, null);
+ addProviderToPhysicalNetwork(physicalNetworkId,
"BaremetalPxeProvider", null, null);
+ addProviderToPhysicalNetwork(physicalNetworkId,
"BaremetaUserdataProvider", null, null);
+ }
+ return null;
+ }
+
protected boolean isNetworkSystem(Network network) {
NetworkOffering no =
_networkOfferingDao.findByIdIncludingRemoved(network.getNetworkOfferingId());
if (no.isSystemOnly()) {
