-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Add support to clone existing offerings and update them #12357
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Pearl1594
wants to merge
31
commits into
main
Choose a base branch
from
clone-edit-existing-offerings
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+10,702
−1,834
Draft
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
e13104b
Add support to clone existing offerings and update them
Pearl1594 afe6c86
add support for vpc & backup offerings to be cloned
Pearl1594 6ce6d3d
fix capability list and mapping of params
Pearl1594 30f277a
Add support to clone network and vpc offering with the right parameters
Pearl1594 9d5e6bf
make fields non mandatory for clone offerings APIs
Pearl1594 3072ef4
Add UI support for cloning Compute and System Service offerings
Pearl1594 6e86139
remove unnecessary changes
Pearl1594 0e20b8a
fix license and pre-ccommit issues
Pearl1594 01a11fb
Add UI support to clone disk and network offering
Pearl1594 fe70dec
vpc & backup offering clone api
Pearl1594 d24ab7e
add unit tests
Pearl1594 611d4d4
fix pre-commit checks
Pearl1594 406e495
increase test coverage
Pearl1594 03b5aed
combine add/clone disk/compute offering forms
Pearl1594 28fe746
update license
Pearl1594 6399e4b
fix unit tests
Pearl1594 4ad44d0
fix test failures
Pearl1594 65e5bb3
fix test failure - unnecessary stubbings
Pearl1594 e637321
pre-commit check failure
Pearl1594 714cb4e
add recently added domain id for bkp offering to be inherited in clon…
Pearl1594 ee2e831
extract common code wrt service capability in network & vpc offering …
Pearl1594 f02f940
add some checks to prevent networkmode change when provider is nsx/ne…
Pearl1594 15c6090
address copilot comments
Pearl1594 f03bef5
address comments
Pearl1594 4a130ce
combine check
Pearl1594 6b071d6
use appropriate zoneId during clone bkp offering
Pearl1594 06af8b6
add check
Pearl1594 7d7ee2f
fix issue with test
Pearl1594 d5138ed
remove unused imports
Pearl1594 d53591c
prevent creating a bkp offering of a bkp repo that already exists
Pearl1594 77ff9e5
extend clone disk and service offerings to domain admins
Pearl1594 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
166 changes: 166 additions & 0 deletions
166
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CloneBackupOfferingCmd.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| // 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.command.admin.backup; | ||
|
|
||
| import javax.inject.Inject; | ||
|
|
||
| import org.apache.cloudstack.acl.RoleType; | ||
| import org.apache.cloudstack.api.APICommand; | ||
| import org.apache.cloudstack.api.ApiConstants; | ||
| import org.apache.cloudstack.api.ApiErrorCode; | ||
| import org.apache.cloudstack.api.BaseAsyncCmd; | ||
| import org.apache.cloudstack.api.BaseCmd; | ||
| import org.apache.cloudstack.api.Parameter; | ||
| import org.apache.cloudstack.api.ServerApiException; | ||
| import org.apache.cloudstack.api.command.offering.DomainAndZoneIdResolver; | ||
| import org.apache.cloudstack.api.response.BackupOfferingResponse; | ||
| import org.apache.cloudstack.api.response.ZoneResponse; | ||
| import org.apache.cloudstack.backup.BackupManager; | ||
| import org.apache.cloudstack.backup.BackupOffering; | ||
| import org.apache.cloudstack.context.CallContext; | ||
|
|
||
| import com.cloud.event.EventTypes; | ||
| import com.cloud.exception.ConcurrentOperationException; | ||
| import com.cloud.exception.InsufficientCapacityException; | ||
| import com.cloud.exception.InvalidParameterValueException; | ||
| import com.cloud.exception.NetworkRuleConflictException; | ||
| import com.cloud.exception.ResourceAllocationException; | ||
| import com.cloud.exception.ResourceUnavailableException; | ||
| import com.cloud.utils.exception.CloudRuntimeException; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.function.LongFunction; | ||
|
|
||
| @APICommand(name = "cloneBackupOffering", | ||
| description = "Clones a backup offering from an existing offering", | ||
| responseObject = BackupOfferingResponse.class, since = "4.23.0", | ||
| authorized = {RoleType.Admin}) | ||
| public class CloneBackupOfferingCmd extends BaseAsyncCmd implements DomainAndZoneIdResolver { | ||
|
|
||
| @Inject | ||
| protected BackupManager backupManager; | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| //////////////// API parameters ///////////////////// | ||
| //////////////////////////////////////////////////// | ||
|
|
||
| @Parameter(name = ApiConstants.SOURCE_OFFERING_ID, type = BaseCmd.CommandType.UUID, entityType = BackupOfferingResponse.class, | ||
| required = true, description = "The ID of the source backup offering to clone from") | ||
| private Long sourceOfferingId; | ||
|
|
||
| @Parameter(name = ApiConstants.NAME, type = BaseCmd.CommandType.STRING, required = true, | ||
| description = "The name of the cloned offering") | ||
| private String name; | ||
|
|
||
| @Parameter(name = ApiConstants.DESCRIPTION, type = BaseCmd.CommandType.STRING, required = false, | ||
| description = "The description of the cloned offering") | ||
| private String description; | ||
|
|
||
| @Parameter(name = ApiConstants.EXTERNAL_ID, type = BaseCmd.CommandType.STRING, required = false, | ||
| description = "The backup offering ID (from backup provider side)") | ||
| private String externalId; | ||
|
|
||
| @Parameter(name = ApiConstants.ZONE_ID, type = BaseCmd.CommandType.UUID, entityType = ZoneResponse.class, | ||
| description = "The zone ID", required = false) | ||
| private Long zoneId; | ||
|
|
||
| @Parameter(name = ApiConstants.DOMAIN_ID, | ||
| type = CommandType.STRING, | ||
| description = "the ID of the containing domain(s) as comma separated string, public for public offerings", | ||
| length = 4096) | ||
| private String domainIds; | ||
|
|
||
| @Parameter(name = ApiConstants.ALLOW_USER_DRIVEN_BACKUPS, type = BaseCmd.CommandType.BOOLEAN, | ||
| description = "Whether users are allowed to create adhoc backups and backup schedules", required = false) | ||
| private Boolean userDrivenBackups; | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| /////////////////// Accessors /////////////////////// | ||
| ///////////////////////////////////////////////////// | ||
|
|
||
| public Long getSourceOfferingId() { | ||
| return sourceOfferingId; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public String getExternalId() { | ||
| return externalId; | ||
| } | ||
|
|
||
| public Long getZoneId() { | ||
| return zoneId; | ||
| } | ||
|
|
||
| public String getDescription() { | ||
| return description; | ||
| } | ||
|
|
||
| public Boolean getUserDrivenBackups() { | ||
| return userDrivenBackups; | ||
| } | ||
|
|
||
| public List<Long> getDomainIds() { | ||
| if (domainIds != null && !domainIds.isEmpty()) { | ||
| return Arrays.asList(Arrays.stream(domainIds.split(",")).map(domainId -> Long.parseLong(domainId.trim())).toArray(Long[]::new)); | ||
| } | ||
| LongFunction<List<Long>> defaultDomainsProvider = null; | ||
| if (backupManager != null) { | ||
| defaultDomainsProvider = backupManager::getBackupOfferingDomains; | ||
| } | ||
| return resolveDomainIds(domainIds, sourceOfferingId, defaultDomainsProvider, "backup offering"); | ||
| } | ||
|
|
||
| ///////////////////////////////////////////////////// | ||
| /////////////// API Implementation/////////////////// | ||
| ///////////////////////////////////////////////////// | ||
|
|
||
| @Override | ||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { | ||
| try { | ||
| BackupOffering policy = backupManager.cloneBackupOffering(this); | ||
| if (policy == null) { | ||
| throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to clone backup offering"); | ||
| } | ||
| BackupOfferingResponse response = _responseGenerator.createBackupOfferingResponse(policy); | ||
| response.setResponseName(getCommandName()); | ||
| setResponseObject(response); | ||
| } catch (InvalidParameterValueException e) { | ||
| throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage()); | ||
| } catch (CloudRuntimeException e) { | ||
| throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public long getEntityOwnerId() { | ||
| return CallContext.current().getCallingAccount().getId(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getEventType() { | ||
| return EventTypes.EVENT_VM_BACKUP_OFFERING_CLONE; | ||
| } | ||
|
|
||
| @Override | ||
| public String getEventDescription() { | ||
| return "Cloning backup offering: " + name + " from source offering: " + (sourceOfferingId == null ? "" : sourceOfferingId.toString()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.