Repository: cloudstack
Updated Branches:
refs/heads/4.5 db6a0d65a -> 1b0a0d68f
CLOUDSTACK-7795
Fix multiple baremetal rct configuraitons
Conflicts:
api/src/com/cloud/event/EventTypes.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b0a0d68
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b0a0d68
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b0a0d68
Branch: refs/heads/4.5
Commit: 1b0a0d68f18720ea95ba8e825cb36abe3785c0f8
Parents: db6a0d6
Author: Frank Zhang <[email protected]>
Authored: Mon Oct 27 15:13:45 2014 -0700
Committer: Frank Zhang <[email protected]>
Committed: Mon Oct 27 16:11:26 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/event/EventTypes.java | 2 +
.../baremetal/database/BaremetalRctVO.java | 5 +-
.../baremetal/manager/BaremetalVlanManager.java | 8 ++
.../manager/BaremetalVlanManagerImpl.java | 36 +++++++++
.../networkservice/BaremetalRctResponse.java | 3 +
.../cloudstack/api/DeleteBaremetalRctCmd.java | 85 ++++++++++++++++++++
6 files changed, 138 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/EventTypes.java
b/api/src/com/cloud/event/EventTypes.java
index 7477152..2e8c8ae 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -454,6 +454,8 @@ 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_RCT_DELETE =
"BAREMETAL.RCT.DELETE";
+ 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";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java
index 91cbc9f..3a24cf4 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java
@@ -17,6 +17,9 @@
//
package com.cloud.baremetal.database;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -30,7 +33,7 @@ import java.util.UUID;
*/
@Entity
@Table(name = "baremetal_rct")
-public class BaremetalRctVO {
+public class BaremetalRctVO implements InternalIdentity, Identity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
index 1662668..76f1052 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
@@ -18,12 +18,14 @@
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;
import com.cloud.utils.component.PluggableService;
import com.cloud.vm.VirtualMachineProfile;
import org.apache.cloudstack.api.AddBaremetalRctCmd;
+import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
/**
* Created by frank on 4/30/14.
@@ -36,4 +38,10 @@ public interface BaremetalVlanManager extends Manager,
PluggableService {
void prepareVlan(Network nw, DeployDestination destHost);
void releaseVlan(Network nw, VirtualMachineProfile vm);
+
+ void registerSwitchBackend(BaremetalSwitchBackend backend);
+
+ void deleteRct(DeleteBaremetalRctCmd cmd);
+
+ BaremetalRctResponse listRct();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
index 0334fb3..97d993e 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -40,6 +40,8 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachineProfile;
import com.google.gson.Gson;
import org.apache.cloudstack.api.AddBaremetalRctCmd;
+import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
+import org.apache.cloudstack.api.ListBaremetalRctCmd;
import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
import org.springframework.web.client.RestTemplate;
@@ -76,9 +78,17 @@ public class BaremetalVlanManagerImpl extends ManagerBase
implements BaremetalVl
BaremetalRct.HostEntry host;
}
+ public void setBackends(Map<String, BaremetalSwitchBackend> backends) {
+ this.backends = backends;
+ }
+
@Override
public BaremetalRctResponse addRct(AddBaremetalRctCmd cmd) {
try {
+ List<BaremetalRctVO> existings = rctDao.listAll();
+ if (!existings.isEmpty()) {
+ throw new CloudRuntimeException(String.format("there is some
RCT existing. A CloudStack deployment accepts only one RCT"));
+ }
URL url = new URL(cmd.getRctUrl());
RestTemplate rest = new RestTemplate();
String rctStr = rest.getForObject(url.toString(), String.class);
@@ -161,6 +171,30 @@ public class BaremetalVlanManagerImpl extends ManagerBase
implements BaremetalVl
backend.removePortFromVlan(struct);
}
+ @Override
+ public void registerSwitchBackend(BaremetalSwitchBackend backend) {
+ backends.put(backend.getSwitchBackendType(), backend);
+ }
+
+ @Override
+ public void deleteRct(DeleteBaremetalRctCmd cmd) {
+ rctDao.remove(cmd.getId());
+ }
+
+ @Override
+ public BaremetalRctResponse listRct() {
+ List<BaremetalRctVO> vos = rctDao.listAll();
+ if (!vos.isEmpty()) {
+ BaremetalRctVO vo = vos.get(0);
+ BaremetalRctResponse rsp = new BaremetalRctResponse();
+ rsp.setId(vo.getUuid());
+ rsp.setUrl(vo.getUrl());
+ rsp.setObjectName("baremetalrct");
+ return rsp;
+ }
+ return null;
+ }
+
private BaremetalSwitchBackend getSwitchBackend(String type) {
BaremetalSwitchBackend backend = backends.get(type);
if (backend == null) {
@@ -193,6 +227,8 @@ public class BaremetalVlanManagerImpl extends ManagerBase
implements BaremetalVl
public List<Class<?>> getCommands() {
List<Class<?>> cmds = new ArrayList<Class<?>>();
cmds.add(AddBaremetalRctCmd.class);
+ cmds.add(ListBaremetalRctCmd.class);
+ cmds.add(DeleteBaremetalRctCmd.class);
return cmds;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java
index cf85f19..d1577aa 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java
@@ -17,14 +17,17 @@
//
package com.cloud.baremetal.networkservice;
+import com.cloud.baremetal.database.BaremetalRctVO;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
/**
* Created by frank on 5/8/14.
*/
+@EntityReference(value = BaremetalRctVO.class)
public class BaremetalRctResponse extends BaseResponse {
@SerializedName(ApiConstants.ID)
@Param(description = "id of rct")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b0a0d68/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java
b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java
new file mode 100755
index 0000000..f1c8423
--- /dev/null
+++
b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java
@@ -0,0 +1,85 @@
+// 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.
+//
+package org.apache.cloudstack.api;
+
+import com.cloud.baremetal.manager.BaremetalVlanManager;
+import com.cloud.baremetal.networkservice.BaremetalRctResponse;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import javax.inject.Inject;
+
+/**
+ * Created by frank on 10/27/14.
+ */
+@APICommand(name = "deleteBaremetalRct", description = "deletes baremetal rack
configuration text", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
authorized = {RoleType.Admin})
+public class DeleteBaremetalRctCmd extends BaseAsyncCmd {
+ private static final String s_name = "deletebaremetalrctresponse";
+ public static final Logger s_logger =
Logger.getLogger(DeleteBaremetalRctCmd.class);
+
+ @Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID,
description = "RCT id", required = true, entityType =
BaremetalRctResponse.class)
+ private Long id;
+
+ @Inject
+ private BaremetalVlanManager vlanMgr;
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_BAREMETAL_RCT_DELETE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Deleting baremetal rct configuration";
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException,
InsufficientCapacityException, ServerApiException,
ConcurrentOperationException, ResourceAllocationException,
NetworkRuleConflictException {
+ try {
+ vlanMgr.deleteRct(this);
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ setResponseObject(response);
+ } catch (Exception e) {
+ s_logger.warn(String.format("unable to add baremetal RCT[%s]",
getId()), e);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,
e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ public Long getId() {
+ return id;
+ }
+}
