Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions hanaonazure/resource-manager/v2017_11_03_preview/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
<version>0.0.3-beta</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>azure-mgmt-hanaonazure</artifactId>
<version>1.0.0-beta-3</version>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for HanaOnAzure Management</name>
<description>This package contains Microsoft HanaOnAzure Management SDK.</description>
Expand Down Expand Up @@ -71,8 +71,6 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,4 @@ public interface HanaInstances extends SupportsCreating<HanaInstance.DefinitionS
*/
Completable shutdownAsync(String resourceGroupName, String hanaInstanceName);

/**
* The operation to add a monitor to an SAP HANA instance.
*
* @param resourceGroupName Name of the resource group.
* @param hanaInstanceName Name of the SAP HANA on Azure instance.
* @param monitoringParameter Request body that only contains monitoring attributes
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable enableMonitoringAsync(String resourceGroupName, String hanaInstanceName, MonitoringDetails monitoringParameter);

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
* Type representing SapMonitor.
*/
public interface SapMonitor extends HasInner<SapMonitorInner>, Resource, GroupableResourceCore<HanaOnAzureManager, SapMonitorInner>, HasResourceGroup, Refreshable<SapMonitor>, Updatable<SapMonitor.Update>, HasManager<HanaOnAzureManager> {
/**
* @return the hanaDbCredentialsMsiId value.
*/
String hanaDbCredentialsMsiId();

/**
* @return the hanaDbName value.
*/
Expand All @@ -34,6 +39,11 @@ public interface SapMonitor extends HasInner<SapMonitorInner>, Resource, Groupab
*/
String hanaDbPassword();

/**
* @return the hanaDbPasswordKeyVaultUrl value.
*/
String hanaDbPasswordKeyVaultUrl();

/**
* @return the hanaDbSqlPort value.
*/
Expand Down Expand Up @@ -81,6 +91,18 @@ interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
}

/**
* The stage of the sapmonitor definition allowing to specify HanaDbCredentialsMsiId.
*/
interface WithHanaDbCredentialsMsiId {
/**
* Specifies hanaDbCredentialsMsiId.
* @param hanaDbCredentialsMsiId MSI ID passed by customer which has access to customer's KeyVault and to be assigned to the Collector VM
* @return the next definition stage
*/
WithCreate withHanaDbCredentialsMsiId(String hanaDbCredentialsMsiId);
}

/**
* The stage of the sapmonitor definition allowing to specify HanaDbName.
*/
Expand All @@ -105,6 +127,18 @@ interface WithHanaDbPassword {
WithCreate withHanaDbPassword(String hanaDbPassword);
}

/**
* The stage of the sapmonitor definition allowing to specify HanaDbPasswordKeyVaultUrl.
*/
interface WithHanaDbPasswordKeyVaultUrl {
/**
* Specifies hanaDbPasswordKeyVaultUrl.
* @param hanaDbPasswordKeyVaultUrl KeyVault URL link to the password for the HANA database
* @return the next definition stage
*/
WithCreate withHanaDbPasswordKeyVaultUrl(String hanaDbPasswordKeyVaultUrl);
}

/**
* The stage of the sapmonitor definition allowing to specify HanaDbSqlPort.
*/
Expand Down Expand Up @@ -158,19 +192,31 @@ interface WithHanaSubnet {
* the resource to be created (via {@link WithCreate#create()}), but also allows
* for any other optional settings to be specified.
*/
interface WithCreate extends Creatable<SapMonitor>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithHanaDbName, DefinitionStages.WithHanaDbPassword, DefinitionStages.WithHanaDbSqlPort, DefinitionStages.WithHanaDbUsername, DefinitionStages.WithHanaHostname, DefinitionStages.WithHanaSubnet {
interface WithCreate extends Creatable<SapMonitor>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithHanaDbCredentialsMsiId, DefinitionStages.WithHanaDbName, DefinitionStages.WithHanaDbPassword, DefinitionStages.WithHanaDbPasswordKeyVaultUrl, DefinitionStages.WithHanaDbSqlPort, DefinitionStages.WithHanaDbUsername, DefinitionStages.WithHanaHostname, DefinitionStages.WithHanaSubnet {
}
}
/**
* The template for a SapMonitor update operation, containing all the settings that can be modified.
*/
interface Update extends Appliable<SapMonitor>, Resource.UpdateWithTags<Update>, UpdateStages.WithHanaDbName, UpdateStages.WithHanaDbPassword, UpdateStages.WithHanaDbSqlPort, UpdateStages.WithHanaDbUsername, UpdateStages.WithHanaHostname, UpdateStages.WithHanaSubnet {
interface Update extends Appliable<SapMonitor>, Resource.UpdateWithTags<Update>, UpdateStages.WithHanaDbCredentialsMsiId, UpdateStages.WithHanaDbName, UpdateStages.WithHanaDbPassword, UpdateStages.WithHanaDbPasswordKeyVaultUrl, UpdateStages.WithHanaDbSqlPort, UpdateStages.WithHanaDbUsername, UpdateStages.WithHanaHostname, UpdateStages.WithHanaSubnet {
}

/**
* Grouping of SapMonitor update stages.
*/
interface UpdateStages {
/**
* The stage of the sapmonitor update allowing to specify HanaDbCredentialsMsiId.
*/
interface WithHanaDbCredentialsMsiId {
/**
* Specifies hanaDbCredentialsMsiId.
* @param hanaDbCredentialsMsiId MSI ID passed by customer which has access to customer's KeyVault and to be assigned to the Collector VM
* @return the next update stage
*/
Update withHanaDbCredentialsMsiId(String hanaDbCredentialsMsiId);
}

/**
* The stage of the sapmonitor update allowing to specify HanaDbName.
*/
Expand All @@ -195,6 +241,18 @@ interface WithHanaDbPassword {
Update withHanaDbPassword(String hanaDbPassword);
}

/**
* The stage of the sapmonitor update allowing to specify HanaDbPasswordKeyVaultUrl.
*/
interface WithHanaDbPasswordKeyVaultUrl {
/**
* Specifies hanaDbPasswordKeyVaultUrl.
* @param hanaDbPasswordKeyVaultUrl KeyVault URL link to the password for the HANA database
* @return the next update stage
*/
Update withHanaDbPasswordKeyVaultUrl(String hanaDbPasswordKeyVaultUrl);
}

/**
* The stage of the sapmonitor update allowing to specify HanaDbSqlPort.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import rx.functions.Func1;
import com.microsoft.azure.PagedList;
import com.microsoft.azure.Page;
import com.microsoft.azure.management.hanaonazure.v2017_11_03_preview.MonitoringDetails;

class HanaInstancesImpl extends GroupableResourcesCoreImpl<HanaInstance, HanaInstanceImpl, HanaInstanceInner, HanaInstancesInner, HanaOnAzureManager> implements HanaInstances {
protected HanaInstancesImpl(HanaOnAzureManager manager) {
Expand Down Expand Up @@ -144,12 +143,6 @@ public Completable shutdownAsync(String resourceGroupName, String hanaInstanceNa
return client.shutdownAsync(resourceGroupName, hanaInstanceName).toCompletable();
}

@Override
public Completable enableMonitoringAsync(String resourceGroupName, String hanaInstanceName, MonitoringDetails monitoringParameter) {
HanaInstancesInner client = this.inner();
return client.enableMonitoringAsync(resourceGroupName, hanaInstanceName, monitoringParameter).toCompletable();
}

@Override
protected HanaInstanceImpl wrapModel(HanaInstanceInner inner) {
return new HanaInstanceImpl(inner.name(), inner, manager());
Expand Down
Loading