Merge 4.5 back into master

api/src/com/cloud/event/EventTypes.java

@@ -454,7 +454,6 @@ public class EventTypes {
  public static final String EVENT_BAREMETAL_PXE_SERVER_ADD = "PHYSICAL.PXE.ADD";
  public static final String EVENT_BAREMETAL_PXE_SERVER_DELETE = "PHYSICAL.PXE.DELETE";
  public static final String EVENT_BAREMETAL_RCT_ADD = "BAREMETAL.RCT.ADD";
- public static final String EVENT_BAREMETAL_PROVISION_DONE = "BAREMETAL.PROVISION.DONE";
 
  public static final String EVENT_AFFINITY_GROUP_CREATE = "AG.CREATE";
  public static final String EVENT_AFFINITY_GROUP_DELETE = "AG.DELETE";

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java → core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java

@@ -1,3 +1,4 @@
+//
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -15,8 +16,8 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-// Automatically generated by addcopyright.py at 01/29/2013
-package com.cloud.baremetal.networkservice;
+
+package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;
 

plugins/hypervisors/baremetal/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml

@@ -28,13 +28,7 @@
  >
 
  <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl" />
- <bean id="BaremetalVlanManager" class="com.cloud.baremetal.manager.BaremetalVlanManagerImpl" >
- <property name="backends">
- <map>
- <entry key="Force10" value-ref="Force10BaremetalSwitchBackend"/>
- </map>
- </property>
- </bean>
+ <bean id="BaremetalVlanManager" class="com.cloud.baremetal.manager.BaremetalVlanManagerImpl" />
  <bean id="Force10BaremetalSwitchBackend" class="com.cloud.baremetal.networkservice.Force10BaremetalSwitchBackend" />
 
  <bean id="BaremetalKickStartPxeService"

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java

@@ -20,12 +20,9 @@
 
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.component.PluggableService;
-import org.apache.cloudstack.api.BaremetalProvisionDoneNotificationCmd;
 
 public interface BaremetalManager extends Manager, PluggableService {
  public static final String EchoSecurityGroupAgent = "EchoSecurityGroupAgent";
  public static final String ExternalBaremetalSystemUrl = "ExternalBaremetalSystemUrl";
  public static final String DO_PXE = "doPxe";
-
- void notifyProvisionDone(BaremetalProvisionDoneNotificationCmd cmd);
 }

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java

@@ -52,8 +52,6 @@ public class BaremetalManagerImpl extends ManagerBase implements BaremetalManage
 
  @Inject
  protected HostDao _hostDao;
- @Inject
- protected VMInstanceDao vmDao;
 
  @Override
  public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
@@ -118,7 +116,6 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<State, Event> t
  public List<Class<?>> getCommands() {
  List<Class<?>> cmds = new ArrayList<Class<?>>();
  cmds.add(AddBaremetalHostCmd.class);
- cmds.add(BaremetalProvisionDoneNotificationCmd.class);
  return cmds;
  }
 

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java

@@ -18,7 +18,6 @@
 package com.cloud.baremetal.manager;
 
 import com.cloud.baremetal.networkservice.BaremetalRctResponse;
-import com.cloud.baremetal.networkservice.BaremetalSwitchBackend;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.network.Network;
 import com.cloud.utils.component.Manager;

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java

@@ -48,6 +48,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -69,17 +70,13 @@ public class BaremetalVlanManagerImpl extends ManagerBase implements BaremetalVl
  @Inject
  private AccountManager acntMgr;
 
- private Map<String, BaremetalSwitchBackend> backends;
+ private Map<String, BaremetalSwitchBackend> backends = new HashMap<>();
 
  private class RackPair {
  BaremetalRct.Rack rack;
  BaremetalRct.HostEntry host;
  }
 
- public void setBackends(Map<String, BaremetalSwitchBackend> backends) {
- this.backends = backends;
- }
-
  @Override
  public BaremetalRctResponse addRct(AddBaremetalRctCmd cmd) {
  try {

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java

@@ -59,15 +59,12 @@
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.resource.ServerResource;
 import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.QueryBuilder;
-import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
 import com.cloud.utils.script.Script2;
 import com.cloud.utils.script.Script2.ParamType;
 import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.PowerState;
 import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.api.ApiConstants;
@@ -110,8 +107,6 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
  protected Script2 _bootOrRebootCommand;
  protected String _vmName;
  protected int ipmiRetryTimes = 5;
- protected boolean provisionDoneNotificationOn = false;
- protected int isProvisionDoneNotificationTimeout = 1800;
 
  protected ConfigurationDao configDao;
  protected VMInstanceDao vmDao;
@@ -186,13 +181,6 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
  s_logger.debug(e.getMessage(), e);
  }
 
- try {
- provisionDoneNotificationOn = Boolean.valueOf(configDao.getValue(Config.BaremetalProvisionDoneNotificationEnabled.key()));
- isProvisionDoneNotificationTimeout = Integer.valueOf(configDao.getValue(Config.BaremetalProvisionDoneNotificationTimeout.key()));
- } catch (Exception e) {
- s_logger.debug(e.getMessage(), e);
- }
-
  String injectScript = "scripts/util/ipmi.py";
  String scriptPath = Script.findScript("", injectScript);
  if (scriptPath == null) {
@@ -404,7 +392,7 @@ public PingCommand getCurrentStatus(long id) {
  VMInstanceVO vm = vms.get(0);
  SecurityGroupHttpClient client = new SecurityGroupHttpClient();
  HashMap<String, Pair<Long, Long>> nwGrpStates = client.sync(vm.getInstanceName(), vm.getId(), vm.getPrivateIpAddress());
- return new PingRoutingWithNwGroupsCommand(getType(), id, null, nwGrpStates);
+ return new PingRoutingWithNwGroupsCommand(getType(), id, getHostVmStateReport(), nwGrpStates);
  }
  } else {
  return new PingRoutingCommand(getType(), id, null);
@@ -593,39 +581,6 @@ protected StartAnswer execute(StartCommand cmd) {
  }
  }
 
- if (provisionDoneNotificationOn) {
- QueryBuilder<VMInstanceVO> q = QueryBuilder.create(VMInstanceVO.class);
- q.and(q.entity().getInstanceName(), SearchCriteria.Op.EQ, vm.getName());
- VMInstanceVO vmvo = q.find();
-
- if (vmvo.getLastHostId() == null) {
- // this is new created vm
- long timeout = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(isProvisionDoneNotificationTimeout);
- while (timeout > System.currentTimeMillis()) {
- try {
- TimeUnit.SECONDS.sleep(5);
- } catch (InterruptedException e) {
- s_logger.warn(e.getMessage(), e);
- }
-
- q = QueryBuilder.create(VMInstanceVO.class);
- q.and(q.entity().getInstanceName(), SearchCriteria.Op.EQ, vm.getName());
- vmvo = q.find();
- if (vmvo == null) {
- return new StartAnswer(cmd, String.format("cannot find vm[name:%s] while waiting for baremtal provision done notification", vm.getName()));
- }
-
- if (VirtualMachine.State.Running == vmvo.getState()) {
- return new StartAnswer(cmd);
- }
-
- s_logger.debug(String.format("still wait for baremetal provision done notification for vm[name:%s], current vm state is %s", vmvo.getInstanceName(), vmvo.getState()));
- }
-
- return new StartAnswer(cmd, String.format("timeout after %s seconds, no baremetal provision done notification received. vm[name:%s] failed to start", isProvisionDoneNotificationTimeout, vm.getName()));
- }
- }
-
  s_logger.debug("Start bare metal vm " + vm.getName() + "successfully");
  _vmName = vm.getName();
  return new StartAnswer(cmd);

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java

@@ -34,6 +34,7 @@
 import com.cloud.agent.api.HostVmStateReportEntry;
 import com.cloud.agent.api.PingCommand;
 import com.cloud.agent.api.PingRoutingCommand;
+import com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.agent.api.routing.VmDataCommand;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java

@@ -30,17 +30,16 @@
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import com.cloud.configuration.Config;
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
 import org.apache.cloudstack.api.AddBaremetalPxeCmd;
 import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.baremetal.IpmISetBootDevCommand;
 import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev;
+import com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.baremetal.database.BaremetalPxeDao;
 import com.cloud.baremetal.database.BaremetalPxeVO;
 import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType;
@@ -224,11 +223,6 @@ private boolean preparePxeInAdvancedZone(VirtualMachineProfile profile, NicProfi
  throw new CloudRuntimeException(String.format("cannot find management nic on virtual router[id:%s]", vr.getId()));
  }
 
- String internalServerIp = _configDao.getValue(Config.BaremetalInternalStorageServer.key());
- if (internalServerIp == null) {
- throw new CloudRuntimeException(String.format("please specify 'baremetal.internal.storage.server.ip', which is the http server/nfs server storing kickstart files and ISO files, in global setting"));
- }
-
  List<String> tuple = parseKickstartUrl(profile);
  String cmd = String.format("/opt/cloud/bin/prepare_pxe.sh %s %s %s %s %s %s", tuple.get(1), tuple.get(2), profile.getTemplate().getUuid(),
  String.format("01-%s", nic.getMacAddress().replaceAll(":", "-")).toLowerCase(), tuple.get(0), nic.getMacAddress().toLowerCase());
@@ -238,7 +232,7 @@ private boolean preparePxeInAdvancedZone(VirtualMachineProfile profile, NicProfi
  throw new CloudRuntimeException(String.format("failed preparing PXE in virtual router[id:%s], because %s", vr.getId(), ret.second()));
  }
 
-//String internalServerIp = "10.223.110.231";
+ String internalServerIp = "10.223.110.231";
  cmd = String.format("/opt/cloud/bin/baremetal_snat.sh %s %s %s", mgmtNic.getIp4Address(), internalServerIp, mgmtNic.getGateway());
  s_logger.debug(String.format("prepare SNAT on virtual router[ip:%s], cmd: %s", mgmtNic.getIp4Address(), cmd));
  ret = SshHelper.sshExecute(mgmtNic.getIp4Address(), 3922, "root", getSystemVMKeyFile(), null, cmd);

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java

@@ -21,7 +21,6 @@
 import com.cloud.baremetal.database.BaremetalPxeVO;
 import com.cloud.baremetal.manager.BaremetalVlanManager;
 import com.cloud.dc.DataCenter;
-import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.Pod;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.deploy.DeployDestination;
@@ -140,9 +139,11 @@ public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm
  }
  }
 
+ /*
  if (dest.getDataCenter().getNetworkType() == DataCenter.NetworkType.Advanced){
  prepareVlan(network, dest);
  }
+ */
 
  return true;
  }
@@ -158,10 +159,12 @@ public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm
  return false;
  }
 
+ /*
  DataCenterVO dc = zoneDao.findById(vm.getVirtualMachine().getDataCenterId());
  if (dc.getNetworkType() == DataCenter.NetworkType.Advanced) {
  releaseVlan(network, vm);
  }
+ */
  return true;
  }