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

Require HostGAPlugin >= 133 for Fast Track #2673

Merged
merged 1 commit into from
Sep 30, 2022
Merged

Require HostGAPlugin >= 133 for Fast Track #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions azurelinuxagent/common/protocol/hostplugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def format_message(msg):
try:
# Raise if VmSettings are not supported, but check again periodically since the HostGAPlugin could have been updated since the last check
# Note that self._host_plugin_supports_vm_settings can be None, so we need to compare against False
if self._supports_vm_settings == False and self._supports_vm_settings_next_check > datetime.datetime.now():
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did this change to silence a Pycharm warning

if not self._supports_vm_settings and self._supports_vm_settings_next_check > datetime.datetime.now():
# Raise VmSettingsNotSupported directly instead of using raise_not_supported() to avoid resetting the timestamp for the next check
raise VmSettingsNotSupported()

Expand Down Expand Up @@ -551,8 +551,8 @@ def format_message(msg):
logger.info(message)
add_event(op=WALAEventOperation.HostPlugin, message=message, is_success=True)

# Don't support HostGAPlugin versions older than 124
if vm_settings.host_ga_plugin_version < FlexibleVersion("1.0.8.124"):
# Don't support HostGAPlugin versions older than 133
if vm_settings.host_ga_plugin_version < FlexibleVersion("1.0.8.133"):
raise_not_supported()

self._supports_vm_settings = True
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-difference_in_required_features.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-empty_depends_on.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "2e7f8b5d-f637-4721-b757-cb190d49b4e9",
"correlationId": "1bef4c48-044e-4225-8f42-1d1eac1eb158",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-fabric-no_thumbprints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-invalid_blob_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "2e7f8b5d-f637-4721-b757-cb190d49b4e9",
"correlationId": "1bef4c48-044e-4225-8f42-1d1eac1eb158",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-missing_cert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-no_manifests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "89d50bf1-fa55-4257-8af3-3db0c9f81ab4",
"correlationId": "c143f8f0-a66b-4881-8c06-1efd278b0b02",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-no_status_upload_blob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-out-of-sync.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "AAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE",
"correlationId": "EEEEEEEE-DDDD-CCCC-BBBB-AAAAAAAAAAAA",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-parse_error.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": THIS_IS_A_SYNTAX_ERROR,
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings-requested_version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down
2 changes: 1 addition & 1 deletion tests/data/hostgaplugin/vm_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"hostGAPluginVersion": "1.0.8.124",
"hostGAPluginVersion": "1.0.8.133",
"vmSettingsSchemaVersion": "0.0",
"activityId": "a33f6f53-43d6-4625-b322-1a39651a00c9",
"correlationId": "9a47a2a2-e740-4bfc-b11b-4f2f7cfe7d2e",
Expand Down