Skip to content
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.

Sign up for GitHub

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

mgmt, update tests and samples #23261

Merged
merged 5 commits into from
Jul 30, 2021
Merged

mgmt, update tests and samples #23261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69e0038
use ssh public key
weidongxu-microsoft Jul 30, 2021
feea6c3
use ssh public key
weidongxu-microsoft Jul 30, 2021
8f8fddc
clear cred
weidongxu-microsoft Jul 30, 2021
b12e6bb
put back the previous disabled monitor test
weidongxu-microsoft Jul 30, 2021
fb7edca
checkstyle
weidongxu-microsoft Jul 30, 2021
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
4 changes: 2 additions & 2 deletions ...ssion-records/ComputeSampleTests.testCreateVirtualMachineUsingSpecializedDiskFromVhd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@
"content-type" : "application/json; charset=utf-8",
"cache-control" : "no-cache",
"x-ms-request-id" : "6ca31e2c-e3e1-4efd-951a-fdb3b58304e7",
"Body" : "{\r\n \"startTime\": \"2018-08-07T23:57:06.954567+00:00\",\r\n \"endTime\": \"2018-08-07T23:57:07.1733107+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"https://md-hppxghwckdc0.blob.core.windows.net/jw2p3qdjhn0x/abcd?sv=2017-04-17&sr=b&si=1842b66c-7221-4e34-8a02-92eb4fd77420&sig=***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"c8866164-1096-4027-b8d9-7e71248d3901\"\r\n}"
"Body" : "{\r\n \"startTime\": \"2018-08-07T23:57:06.954567+00:00\",\r\n \"endTime\": \"2018-08-07T23:57:07.1733107+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"c8866164-1096-4027-b8d9-7e71248d3901\"\r\n}"
}
}, {
"Method" : "GET",
Expand Down Expand Up @@ -1762,7 +1762,7 @@
"content-type" : "application/json; charset=utf-8",
"cache-control" : "no-cache",
"x-ms-request-id" : "54baac2f-7781-476e-a623-19d1c09af8f5",
"Body" : "{\r\n \"startTime\": \"2018-08-07T23:57:37.2045624+00:00\",\r\n \"endTime\": \"2018-08-07T23:57:37.407689+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"https://md-hppxghwckdc0.blob.core.windows.net/hvxm2wkvqp52/abcd?sv=2017-04-17&sr=b&si=f30ba03b-54b0-4154-acb2-80b02f451db3&sig=***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"0382fdf5-4fa9-42ea-aba5-7ce7a46d1efd\"\r\n}"
"Body" : "{\r\n \"startTime\": \"2018-08-07T23:57:37.2045624+00:00\",\r\n \"endTime\": \"2018-08-07T23:57:37.407689+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"0382fdf5-4fa9-42ea-aba5-7ce7a46d1efd\"\r\n}"
}
}, {
"Method" : "DELETE",
Expand Down
4 changes: 2 additions & 2 deletions ...st/resources/session-records/ManagedDiskOperationsTests.canOperateOnEmptyManagedDisk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
"x-ms-routing-request-id" : "SOUTHEASTASIA:20210721T072005Z:c319f75f-faf0-43ac-b2a5-a2daffbfb65a",
"Expires" : "-1",
"x-ms-request-id" : "5303a7fe-f4f8-41ed-8278-bc870c1c68db",
"Body" : "{\r\n \"startTime\": \"2021-07-21T07:19:34.8942322+00:00\",\r\n \"endTime\": \"2021-07-21T07:19:35.1286072+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"https://md-hdd-gsdb5tjdgfnn.z22.blob.storage.azure.net/t1l5xz1wh0dx/abcd?sv=2018-03-28&sr=b&si=992a2a15-7120-40bc-8f0a-d8e0ca563bd9&sig=***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"69d9cd47-72d9-4a5e-8176-627ed8e93e80\"\r\n}",
"Body" : "{\r\n \"startTime\": \"2021-07-21T07:19:34.8942322+00:00\",\r\n \"endTime\": \"2021-07-21T07:19:35.1286072+00:00\",\r\n \"status\": \"Succeeded\",\r\n \"properties\": {\r\n \"output\": {\r\n \"accessSAS\": \"***REMOVED***\"\r\n}\r\n },\r\n \"name\": \"69d9cd47-72d9-4a5e-8176-627ed8e93e80\"\r\n}",
"x-ms-client-request-id" : "8bc18375-0ac3-4834-99d3-dd9359e33d3b",
"Content-Type" : "application/json; charset=utf-8"
},
Expand Down Expand Up @@ -348,7 +348,7 @@
"x-ms-routing-request-id" : "SOUTHEASTASIA:20210721T072006Z:0fec106c-caa4-477f-bc27-6377c486af20",
"Expires" : "-1",
"x-ms-request-id" : "1681c506-0f96-4151-b75b-f5ce3e23b8b2",
"Body" : "{\r\n \"accessSAS\": \"https://md-hdd-gsdb5tjdgfnn.z22.blob.storage.azure.net/t1l5xz1wh0dx/abcd?sv=2018-03-28&sr=b&si=992a2a15-7120-40bc-8f0a-d8e0ca563bd9&sig=***REMOVED***\"\r\n}",
"Body" : "{\r\n \"accessSAS\": \"***REMOVED***\"\r\n}",
"x-ms-client-request-id" : "d3a33bab-83bb-4a39-bdfd-ef718d181153",
"Content-Type" : "application/json; charset=utf-8"
},
Expand Down
7 changes: 7 additions & 0 deletions sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager-eventhubs</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-eventhubs;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -133,6 +139,7 @@
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.models.implementation=ALL-UNNAMED
--add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.model.implementation=ALL-UNNAMED

--add-opens com.azure.resourcemanager.monitor/com.azure.resourcemanager.monitor=ALL-UNNAMED
--add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED
Expand Down
179 changes: 95 additions & 84 deletions ...ager-monitor/src/test/java/com/azure/resourcemanager/monitor/DiagnosticSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@
package com.azure.resourcemanager.monitor;

import com.azure.core.http.HttpPipeline;
import com.azure.resourcemanager.compute.models.VirtualMachine;
import com.azure.resourcemanager.eventhubs.models.EventHubNamespace;
import com.azure.resourcemanager.eventhubs.models.EventHubNamespaceAuthorizationRule;
import com.azure.resourcemanager.monitor.models.DiagnosticSetting;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.monitor.models.DiagnosticSettingsCategory;
import com.azure.resourcemanager.storage.models.StorageAccount;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.util.List;
import java.util.stream.Collectors;

public class DiagnosticSettingsTests extends MonitorManagementTest {
private String rgName = "";
Expand All @@ -29,90 +39,91 @@ protected void cleanUpResources() {
resourceManager.resourceGroups().beginDeleteByName(rgName);
}

// TODO (weidxu) need eventhub service
// @Test
// public void canCRUDDiagnosticSettings() throws Exception {
//
// VirtualMachine vm = computeManager.virtualMachines().list().iterator().next();
//
// // clean all diagnostic settings.
// PagedIterable<DiagnosticSetting> dsList = monitorManager.diagnosticSettings().listByResource(vm.id());
// for(DiagnosticSetting dsd : dsList) {
// monitorManager.diagnosticSettings().deleteById(dsd.id());
// }
//
// StorageAccount sa = storageManager.storageAccounts()
// .define(SA_NAME)
// // Storage Account should be in the same region as resource
// .withRegion(vm.region())
// .withNewResourceGroup(RG_NAME)
// .withTag("tag1", "value1")
// .create();
//
// EventHubNamespace namespace = eventHubManager.namespaces()
// .define(EH_NAME)
// // EventHub should be in the same region as resource
// .withRegion(vm.region())
// .withNewResourceGroup(RG_NAME)
// .withNewManageRule("mngRule1")
// .withNewSendRule("sndRule1")
// .create();
//
// EventHubNamespaceAuthorizationRule evenHubNsRule = namespace.listAuthorizationRules().get(0);
//
// List<DiagnosticSettingsCategory> categories = monitorManager.diagnosticSettings()
// .listCategoriesByResource(vm.id());
//
// Assertions.assertNotNull(categories);
// Assertions.assertFalse(categories.isEmpty());
//
// DiagnosticSetting setting = monitorManager.diagnosticSettings()
// .define(DS_NAME)
// .withResource(vm.id())
// .withStorageAccount(sa.id())
// .withEventHub(evenHubNsRule.id())
// .withLogsAndMetrics(categories, Period.minutes(5), 7)
// .create();
//
// Assertions.assertTrue(vm.id().equalsIgnoreCase(setting.resourceId()));
// Assertions.assertTrue(sa.id().equalsIgnoreCase(setting.storageAccountId()));
// Assertions.assertTrue(evenHubNsRule.id().equalsIgnoreCase(setting.eventHubAuthorizationRuleId()));
// Assertions.assertNull(setting.eventHubName());
// Assertions.assertNull(setting.workspaceId());
// Assertions.assertTrue(setting.logs().isEmpty());
// Assertions.assertFalse(setting.metrics().isEmpty());
//
// setting.update()
// .withoutStorageAccount()
// .withoutLogs()
// .apply();
//
// Assertions.assertTrue(vm.id().equalsIgnoreCase(setting.resourceId()));
// Assertions.assertTrue(evenHubNsRule.id().equalsIgnoreCase(setting.eventHubAuthorizationRuleId()));
// Assertions.assertNull(setting.storageAccountId());
// Assertions.assertNull(setting.eventHubName());
// Assertions.assertNull(setting.workspaceId());
// Assertions.assertTrue(setting.logs().isEmpty());
// Assertions.assertFalse(setting.metrics().isEmpty());
//
// DiagnosticSetting ds1 = monitorManager.diagnosticSettings().get(setting.resourceId(), setting.name());
// checkDiagnosticSettingValues(setting, ds1);
//
// DiagnosticSetting ds2 = monitorManager.diagnosticSettings().getById(setting.id());
// checkDiagnosticSettingValues(setting, ds2);
//
// dsList = monitorManager.diagnosticSettings().listByResource(vm.id());
// Assertions.assertNotNull(dsList);
// Assertions.assertEquals(1, dsList.size());
// DiagnosticSetting ds3 = dsList.get(0);
// checkDiagnosticSettingValues(setting, ds3);
//
// monitorManager.diagnosticSettings().deleteById(setting.id());
//
// dsList = monitorManager.diagnosticSettings().listByResource(vm.id());
// Assertions.assertNotNull(dsList);
// Assertions.assertTrue(dsList.isEmpty());
// }
@Test
public void canCRUDDiagnosticSettings() throws Exception {

// make sure there exists a VM

VirtualMachine vm = computeManager.virtualMachines().list().iterator().next();

// clean all diagnostic settings.
List<DiagnosticSetting> dsList = monitorManager.diagnosticSettings().listByResource(vm.id()).stream().collect(Collectors.toList());
for (DiagnosticSetting dsd : dsList) {
monitorManager.diagnosticSettings().deleteById(dsd.id());
}

StorageAccount sa = storageManager.storageAccounts()
.define(saName)
// Storage Account should be in the same region as resource
.withRegion(vm.region())
.withNewResourceGroup(rgName)
.withTag("tag1", "value1")
.create();

EventHubNamespace namespace = eventHubManager.namespaces()
.define(ehName)
// EventHub should be in the same region as resource
.withRegion(vm.region())
.withNewResourceGroup(rgName)
.withNewManageRule("mngRule1")
.withNewSendRule("sndRule1")
.create();

EventHubNamespaceAuthorizationRule evenHubNsRule = namespace.listAuthorizationRules().iterator().next();

List<DiagnosticSettingsCategory> categories = monitorManager.diagnosticSettings()
.listCategoriesByResource(vm.id());

Assertions.assertNotNull(categories);
Assertions.assertFalse(categories.isEmpty());

DiagnosticSetting setting = monitorManager.diagnosticSettings()
.define(dsName)
.withResource(vm.id())
.withStorageAccount(sa.id())
.withEventHub(evenHubNsRule.id())
.withLogsAndMetrics(categories, Duration.ofMinutes(5), 7)
.create();

Assertions.assertTrue(vm.id().equalsIgnoreCase(setting.resourceId()));
Assertions.assertTrue(sa.id().equalsIgnoreCase(setting.storageAccountId()));
Assertions.assertTrue(evenHubNsRule.id().equalsIgnoreCase(setting.eventHubAuthorizationRuleId()));
Assertions.assertNull(setting.eventHubName());
Assertions.assertNull(setting.workspaceId());
Assertions.assertTrue(setting.logs().isEmpty());
Assertions.assertFalse(setting.metrics().isEmpty());

setting.update()
.withoutStorageAccount()
.withoutLogs()
.apply();

Assertions.assertTrue(vm.id().equalsIgnoreCase(setting.resourceId()));
Assertions.assertTrue(evenHubNsRule.id().equalsIgnoreCase(setting.eventHubAuthorizationRuleId()));
Assertions.assertNull(setting.storageAccountId());
Assertions.assertNull(setting.eventHubName());
Assertions.assertNull(setting.workspaceId());
Assertions.assertTrue(setting.logs().isEmpty());
Assertions.assertFalse(setting.metrics().isEmpty());

DiagnosticSetting ds1 = monitorManager.diagnosticSettings().get(setting.resourceId(), setting.name());
checkDiagnosticSettingValues(setting, ds1);

DiagnosticSetting ds2 = monitorManager.diagnosticSettings().getById(setting.id());
checkDiagnosticSettingValues(setting, ds2);

dsList = monitorManager.diagnosticSettings().listByResource(vm.id()).stream().collect(Collectors.toList());
Assertions.assertNotNull(dsList);
Assertions.assertEquals(1, dsList.size());
DiagnosticSetting ds3 = dsList.get(0);
checkDiagnosticSettingValues(setting, ds3);

monitorManager.diagnosticSettings().deleteById(setting.id());

dsList = monitorManager.diagnosticSettings().listByResource(vm.id()).stream().collect(Collectors.toList());
Assertions.assertNotNull(dsList);
Assertions.assertTrue(dsList.isEmpty());
}

private void checkDiagnosticSettingValues(DiagnosticSetting expected, DiagnosticSetting actual) {
Assertions.assertTrue(expected.resourceId().equalsIgnoreCase(actual.resourceId()));
Expand Down
8 changes: 3 additions & 5 deletions ...anager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import com.azure.core.http.policy.RetryPolicy;
import com.azure.resourcemanager.appservice.AppServiceManager;
import com.azure.resourcemanager.compute.ComputeManager;
// import com.azure.management.eventhub.implementation.EventHubManager;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.eventhubs.EventHubsManager;
import com.azure.resourcemanager.resources.ResourceManager;
import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider;
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
Expand All @@ -30,7 +30,7 @@ public class MonitorManagementTest extends ResourceManagerTestBase {
protected MonitorManager monitorManager;
protected ComputeManager computeManager;
protected StorageManager storageManager;
// protected EventHubManager eventHubManager;
protected EventHubsManager eventHubManager;
protected AppServiceManager appServiceManager;

@Override
Expand Down Expand Up @@ -60,11 +60,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile
monitorManager = buildManager(MonitorManager.class, httpPipeline, profile);
computeManager = buildManager(ComputeManager.class, httpPipeline, profile);
storageManager = buildManager(StorageManager.class, httpPipeline, profile);
eventHubManager = buildManager(EventHubsManager.class, httpPipeline, profile);
resourceManager = monitorManager.resourceManager();
setInternalContext(internalContext, computeManager);

// eventHubManager = EventHubManager
// .authenticate(restClient, defaultSubscription, internalContext);
}

@Override
Expand Down
Loading