Move the PrepareKickstartPxeServerCommand to the core api so other
modules can use it.
(cherry picked from commit b6401b04f22b0a5b686c7c477da4c6e0fd18df84)
Conflicts:
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5990ed46
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5990ed46
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5990ed46
Branch: refs/heads/4.5
Commit: 5990ed461049a51c57e76ff8c9ae1fb3355c3ea3
Parents: 160aa84
Author: Hugo Trippaers <[email protected]>
Authored: Tue Sep 30 14:59:38 2014 +0200
Committer: David Nalley <[email protected]>
Committed: Mon Oct 13 00:22:50 2014 -0400
----------------------------------------------------------------------
.../PrepareKickstartPxeServerCommand.java | 83 ++++++++++++++++++++
.../BaremetalKickStartPxeResource.java | 1 +
.../BaremetalKickStartServiceImpl.java | 3 +
.../PrepareKickstartPxeServerCommand.java | 83 --------------------
4 files changed, 87 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5990ed46/core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java
----------------------------------------------------------------------
diff --git
a/core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java
b/core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java
new file mode 100755
index 0000000..6f7ddad
--- /dev/null
+++
b/core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java
@@ -0,0 +1,83 @@
+// 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
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// Automatically generated by addcopyright.py at 01/29/2013
+package com.cloud.agent.api.baremetal;
+
+import com.cloud.agent.api.Command;
+
+public class PrepareKickstartPxeServerCommand extends Command {
+ private String ksFile;
+ private String templateUuid;
+ private String mac;
+ private String ksDevice;
+ private String kernel;
+ private String initrd;
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+ public String getKsFile() {
+ return ksFile;
+ }
+
+ public void setKsFile(String ksFile) {
+ this.ksFile = ksFile;
+ }
+
+ public String getKernel() {
+ return kernel;
+ }
+
+ public void setKernel(String kernel) {
+ this.kernel = kernel;
+ }
+
+ public String getInitrd() {
+ return initrd;
+ }
+
+ public void setInitrd(String initrd) {
+ this.initrd = initrd;
+ }
+
+ public String getTemplateUuid() {
+ return templateUuid;
+ }
+
+ public void setTemplateUuid(String templateUuid) {
+ this.templateUuid = templateUuid;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public void setMac(String mac) {
+ this.mac = mac;
+ }
+
+ public String getKsDevice() {
+ return ksDevice;
+ }
+
+ public void setKsDevice(String ksDevice) {
+ this.ksDevice = ksDevice;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5990ed46/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
index 260f4f1..75be597 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java
@@ -34,6 +34,7 @@ import com.cloud.agent.api.Command;
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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5990ed46/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
index bd363f6..df06650 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -30,6 +30,8 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.configuration.Config;
+
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
@@ -39,6 +41,7 @@ import
org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.baremetal.IpmISetBootDevCommand;
+import com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev;
import com.cloud.baremetal.database.BaremetalPxeDao;
import com.cloud.baremetal.database.BaremetalPxeVO;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5990ed46/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java
deleted file mode 100755
index 4f59a83..0000000
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// Automatically generated by addcopyright.py at 01/29/2013
-package com.cloud.baremetal.networkservice;
-
-import com.cloud.agent.api.Command;
-
-public class PrepareKickstartPxeServerCommand extends Command {
- private String ksFile;
- private String templateUuid;
- private String mac;
- private String ksDevice;
- private String kernel;
- private String initrd;
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
-
- public String getKsFile() {
- return ksFile;
- }
-
- public void setKsFile(String ksFile) {
- this.ksFile = ksFile;
- }
-
- public String getKernel() {
- return kernel;
- }
-
- public void setKernel(String kernel) {
- this.kernel = kernel;
- }
-
- public String getInitrd() {
- return initrd;
- }
-
- public void setInitrd(String initrd) {
- this.initrd = initrd;
- }
-
- public String getTemplateUuid() {
- return templateUuid;
- }
-
- public void setTemplateUuid(String templateUuid) {
- this.templateUuid = templateUuid;
- }
-
- public String getMac() {
- return mac;
- }
-
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- public String getKsDevice() {
- return ksDevice;
- }
-
- public void setKsDevice(String ksDevice) {
- this.ksDevice = ksDevice;
- }
-}
