diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupProvidersCmd.java index 2832a39b2a5..bbc707e3e57 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupProvidersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupProvidersCmd.java @@ -83,7 +83,7 @@ public class ListBackupProvidersCmd extends BaseListCmd { final BackupProviderResponse backupProviderResponse = new BackupProviderResponse(); backupProviderResponse.setName(provider.getName()); backupProviderResponse.setDescription(provider.getDescription()); - backupProviderResponse.setObjectName("provider"); + backupProviderResponse.setObjectName("providers"); responses.add(backupProviderResponse); } response.setResponses(responses); diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java index 9997cb9ede2..7443fc135f8 100644 --- a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java +++ b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java @@ -43,7 +43,6 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer "", "The backup and recovery provider plugin.", true, ConfigKey.Scope.Zone); - /** * Generate a response from the Backup Policy VO */ diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupProviderDriver.java b/api/src/main/java/org/apache/cloudstack/backup/BackupProviderDriver.java deleted file mode 100644 index 4f5916d40e2..00000000000 --- a/api/src/main/java/org/apache/cloudstack/backup/BackupProviderDriver.java +++ /dev/null @@ -1,58 +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. - -package org.apache.cloudstack.backup; - -import java.util.List; - -import org.apache.cloudstack.framework.backup.BackupPolicy; - -import com.cloud.utils.component.Adapter; - -/** - * Backup and Recovery Provider - */ -public interface BackupProviderDriver extends Adapter { - - /** - * Register Backup and Recovery Provider - */ - boolean registerProvider(long zoneId, String name, String url, String username, String password); - - /** - * True if policy exists on the provider, false if not - */ - boolean policyExists(String policyId, String policyName); - - /** - * List existing Backup Policies on the provider - */ - List listBackupPolicies(long providerId); - - /** - * Assign a VM to an existing backup policy - */ - boolean assignVMToBackupPolicy(String policyId, String vmId); - - /** - * Unregister Backup and Recovery Provider - */ - boolean unregisterProvider(); - - void restoreVMFromBackup(); - void restoreAndAttachVolumeToVM(); -} diff --git a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java index ad4e04e90ca..40fdb6fc2c3 100644 --- a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java +++ b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java @@ -29,6 +29,6 @@ public class DummyBackupProvider extends AdapterBase implements BackupProvider { @Override public String getDescription() { - return "Dummy B&R Provider"; + return "Dummy B&R Plugin"; } }