-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fixes issue with loading Capacity dashboard when mulitple backup providers configured #12550
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
base: 4.20
Are you sure you want to change the base?
Changes from all commits
0bb1616
94ac3ea
2d146fa
de23052
174f92d
0669ac3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // 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.framework.config; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| public class ValidatedConfigKey<T> extends ConfigKey<T> { | ||
| private final Consumer<T> validator; | ||
|
|
||
| public ValidatedConfigKey(String category, Class<T> type, String name, String defaultValue, String description, boolean dynamic, Scope scope, String parent, Consumer<T> validator) { | ||
| super(category, type, name, defaultValue, description, dynamic, scope, parent); | ||
| this.validator = validator; | ||
| } | ||
|
|
||
| public Consumer<T> getValidator() { | ||
| return validator; | ||
| } | ||
|
|
||
| public void validateValue(String value) { | ||
| if (validator != null) { | ||
| validator.accept((T) value); | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -972,10 +972,11 @@ public BackupProvider getBackupProvider(final String name) { | |
| if (StringUtils.isEmpty(name)) { | ||
| throw new CloudRuntimeException("Invalid backup provider name provided"); | ||
| } | ||
| if (!backupProvidersMap.containsKey(name)) { | ||
| String[] backupProviderNames = name.split(","); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not possible now, right?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think so, currently, ACS allows taking any string as input, so if we provide a comma separated string, it would compare that with providers supported in ACS, and would fail and report Cannot find backup provider by name: dummy,nas (if both were set) |
||
| if (!backupProvidersMap.containsKey(backupProviderNames[0])) { | ||
| throw new CloudRuntimeException("Failed to find backup provider by the name: " + name); | ||
| } | ||
| return backupProvidersMap.get(name); | ||
| return backupProvidersMap.get(backupProviderNames[0]); | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.