Merge branch 'master' into dualstack-support

metal-stack · Nov 19, 2024 · e726090 · e726090
2 parents 03c2436 + 3c22c0d
commit e726090
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cmd/metal-api/internal/datastore/switch.go b/cmd/metal-api/internal/datastore/switch.go
@@ -227,3 +227,8 @@ func (rs *RethinkStore) GetSwitchStatus(id string) (*metal.SwitchStatus, error)
 func (rs *RethinkStore) SetSwitchStatus(state *metal.SwitchStatus) error {
 	return rs.upsertEntity(rs.switchStatusTable(), state)
 }
+
+// DeleteSwitchStatus delete SwitchStatus
+func (rs *RethinkStore) DeleteSwitchStatus(status *metal.SwitchStatus) error {
+	return rs.deleteEntity(rs.switchStatusTable(), status)
+}
diff --git a/cmd/metal-api/internal/service/switch-service.go b/cmd/metal-api/internal/service/switch-service.go
@@ -232,6 +232,18 @@ func (r *switchResource) deleteSwitch(request *restful.Request, response *restfu
 		return
 	}
 
+	status, err := r.ds.GetSwitchStatus(id)
+	if err == nil {
+		err = r.ds.DeleteSwitchStatus(status)
+		if err != nil {
+			r.sendError(request, response, defaultError(err))
+			return
+		}
+	} else if !metal.IsNotFound(err) {
+		r.sendError(request, response, defaultError(err))
+		return
+	}
+
 	resp, err := r.makeSwitchResponse(s)
 	if err != nil {
 		r.sendError(request, response, defaultError(err))