-
Notifications
You must be signed in to change notification settings - Fork 1.4k
alert messages restructure #13775
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
DaanHoogland
wants to merge
4
commits into
main
Choose a base branch
from
ghi7297-messages
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.
+360
−54
Draft
alert messages restructure #13775
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
39 changes: 39 additions & 0 deletions
39
engine/components-api/src/main/java/com/cloud/alert/AlertFormatUtils.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,39 @@ | ||
| // 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 com.cloud.alert; | ||
|
|
||
| import com.cloud.dc.DataCenter; | ||
| import com.cloud.dc.Pod; | ||
| import com.cloud.host.Host; | ||
|
|
||
| /** | ||
| * Shared formatting for the host/zone/pod description that recurs, independently | ||
| * hand-rolled and inconsistently worded (and occasionally mislabelled), across the | ||
| * HA and agent-management alert call sites. See CLOUDSTACK-7297. | ||
| */ | ||
| public final class AlertFormatUtils { | ||
|
|
||
| private AlertFormatUtils() { | ||
| } | ||
|
|
||
| public static String describeHostLocation(Host host, DataCenter zone, Pod pod) { | ||
| return String.format("name: %s (id: %d, uuid: %s), availability zone: %s, pod: %s", | ||
| host.getName(), host.getId(), host.getUuid(), | ||
| zone != null ? zone.getName() : "unknown", | ||
| pod != null ? pod.getName() : "unknown"); | ||
| } | ||
|
Comment on lines
+33
to
+38
|
||
| } | ||
94 changes: 94 additions & 0 deletions
94
engine/components-api/src/test/java/com/cloud/alert/AlertFormatUtilsTest.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,94 @@ | ||
| // 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 com.cloud.alert; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| import com.cloud.dc.DataCenter; | ||
| import com.cloud.dc.Pod; | ||
| import com.cloud.host.Host; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class AlertFormatUtilsTest { | ||
|
|
||
| @Mock | ||
| Host host; | ||
| @Mock | ||
| DataCenter zone; | ||
| @Mock | ||
| Pod pod; | ||
|
|
||
| @Test | ||
| public void describeHostLocationIncludesNameIdUuidZoneAndPod() { | ||
| setUpHost(); | ||
| setUpZone(); | ||
| setUpPod(); | ||
|
|
||
| String result = AlertFormatUtils.describeHostLocation(host, zone, pod); | ||
|
|
||
| assertEquals("name: cs-kvm06 (id: 37, uuid: host-uuid), availability zone: Milton1, pod: Milton1-Pod1", result); | ||
| } | ||
|
|
||
| @Test | ||
| public void describeHostLocationFallsBackToUnknownForNullZone() { | ||
| setUpHost(); | ||
| setUpPod(); | ||
|
|
||
| String result = AlertFormatUtils.describeHostLocation(host, null, pod); | ||
|
|
||
| assertEquals("name: cs-kvm06 (id: 37, uuid: host-uuid), availability zone: unknown, pod: Milton1-Pod1", result); | ||
| } | ||
|
|
||
| @Test | ||
| public void describeHostLocationFallsBackToUnknownForNullPod() { | ||
| setUpHost(); | ||
| setUpZone(); | ||
|
|
||
| String result = AlertFormatUtils.describeHostLocation(host, zone, null); | ||
|
|
||
| assertEquals("name: cs-kvm06 (id: 37, uuid: host-uuid), availability zone: Milton1, pod: unknown", result); | ||
| } | ||
|
|
||
| @Test | ||
| public void describeHostLocationFallsBackToUnknownForNullZoneAndPod() { | ||
| setUpHost(); | ||
|
|
||
| String result = AlertFormatUtils.describeHostLocation(host, null, null); | ||
|
|
||
| assertEquals("name: cs-kvm06 (id: 37, uuid: host-uuid), availability zone: unknown, pod: unknown", result); | ||
| } | ||
|
|
||
| private void setUpHost() { | ||
| when(host.getName()).thenReturn("cs-kvm06"); | ||
| when(host.getId()).thenReturn(37L); | ||
| when(host.getUuid()).thenReturn("host-uuid"); | ||
| } | ||
|
|
||
| private void setUpZone() { | ||
| when(zone.getName()).thenReturn("Milton1"); | ||
| } | ||
|
|
||
| private void setUpPod() { | ||
| when(pod.getName()).thenReturn("Milton1-Pod1"); | ||
| } | ||
| } |
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
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
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.