Baremetal: Fix API's packages and categories

This commit is contained in:
Sheng Yang 2013-06-19 15:00:42 -07:00
parent 041303cc67
commit 759269fcd8
15 changed files with 34 additions and 6 deletions

View File

@ -602,6 +602,9 @@ revertToVMSnapshot=15
#### Baremetal commands
addBaremetalHost=1
addBaremetalPxeKickStartServer=1
addBaremetalPxePingServer=1
addBaremetalDhcp=1
#### New Load Balancer commands
createLoadBalancer=15

View File

@ -26,6 +26,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.AddBaremetalHostCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.api.StopAnswer;

View File

@ -31,6 +31,8 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxePingServerCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;

View File

@ -24,6 +24,8 @@ package com.cloud.baremetal.networkservice;
import java.util.List;
import org.apache.cloudstack.api.AddBaremetalDhcpCmd;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ResourceUnavailableException;

View File

@ -32,6 +32,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.AddBaremetalDhcpCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;

View File

@ -27,6 +27,8 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;

View File

@ -24,6 +24,8 @@ package com.cloud.baremetal.networkservice;
import java.util.List;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.deploy.DeployDestination;
import com.cloud.host.HostVO;

View File

@ -31,6 +31,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxePingServerCmd;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;

View File

@ -24,6 +24,8 @@ package com.cloud.baremetal.networkservice;
import java.util.List;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.deploy.DeployDestination;
import com.cloud.host.Host;

View File

@ -16,7 +16,7 @@
// under the License.
//
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.networkservice;
package org.apache.cloudstack.api;
import javax.inject.Inject;
@ -33,6 +33,8 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.log4j.Logger;
import com.cloud.baremetal.database.BaremetalDhcpVO;
import com.cloud.baremetal.networkservice.BaremetalDhcpManager;
import com.cloud.baremetal.networkservice.BaremetalDhcpResponse;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;

View File

@ -16,13 +16,15 @@
// under the License.
//
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.manager;
package org.apache.cloudstack.api;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.admin.host.AddHostCmd;
import org.apache.cloudstack.api.response.HostResponse;
import com.cloud.baremetal.manager.BareMetalDiscoverer;
@APICommand(name="addBaremetalHost", description="add a baremetal host", responseObject = HostResponse.class)
public class AddBaremetalHostCmd extends AddHostCmd {

View File

@ -16,12 +16,14 @@
// under the License.
//
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.networkservice;
package org.apache.cloudstack.api;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.Parameter;
import com.cloud.baremetal.networkservice.BaremetalPxeKickStartResponse;
@APICommand(name="addBaremetalPxeKickStartServer", description="add a baremetal pxe server", responseObject = BaremetalPxeKickStartResponse.class)
public class AddBaremetalKickStartPxeCmd extends AddBaremetalPxeCmd {
@Parameter(name=ApiConstants.TFTP_DIR, type=CommandType.STRING, required = true, description="Tftp root directory of PXE server")

View File

@ -16,7 +16,7 @@
// under the License.
//
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.networkservice;
package org.apache.cloudstack.api;
import javax.inject.Inject;
@ -33,6 +33,7 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.log4j.Logger;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.baremetal.networkservice.BaremetalPxeManager;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;

View File

@ -16,12 +16,14 @@
// under the License.
//
// Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.networkservice;
package org.apache.cloudstack.api;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.Parameter;
import com.cloud.baremetal.networkservice.BaremetalPxePingResponse;
@APICommand(name="addBaremetalPxePingServer", description="add a baremetal ping pxe server", responseObject = BaremetalPxePingResponse.class)
public class AddBaremetalPxePingServerCmd extends AddBaremetalPxeCmd {

View File

@ -151,7 +151,8 @@ known_categories = {
'DeploymentPlanners': 'Configuration',
'PortableIp': 'Portable IP',
'dedicateHost': 'Dedicate Resources',
'releaseDedicatedHost': 'Dedicate Resources'
'releaseDedicatedHost': 'Dedicate Resources',
'Baremetal' : 'Baremetal'
}