From 4fb0b5a09b26135ade285844da5d7dfe582a8d4c Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Thu, 18 May 2017 19:58:02 +0200 Subject: Import patches-unapplied version 2.2.12-0ubuntu1 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 473ad6fbfe0b9c3b362b530492928303f2b4c7f3 New changelog entries: * New upstream release (LP: #1690854). - Refreshed debian/patches/disable_import_test.patch. --- tests/data/events/1478123456789000.tld | 1 + tests/data/events/1478123456789001.tld | 1 + tests/data/events/1479766858966718.tld | 1 + tests/data/ext/sample_ext-1.2.0.zip | Bin 0 -> 878 bytes .../data/ext/sample_ext-1.2.0/HandlerManifest.json | 14 +++ tests/data/ext/sample_ext-1.2.0/sample.py | 37 +++++++ tests/data/ext/sample_ext.zip | Bin 878 -> 0 bytes tests/data/ext/sample_ext/HandlerManifest.json | 14 --- tests/data/ext/sample_ext/sample.py | 37 ------- tests/data/ga/WALinuxAgent-2.2.11.zip | Bin 0 -> 450878 bytes tests/data/ga/WALinuxAgent-2.2.8.zip | Bin 415285 -> 0 bytes tests/data/ga/supported.json | 8 ++ tests/data/metadata/vmagent_manifest1.json | 20 ++++ tests/data/metadata/vmagent_manifest2.json | 20 ++++ tests/data/metadata/vmagent_manifests.json | 7 ++ .../data/metadata/vmagent_manifests_invalid1.json | 10 ++ .../data/metadata/vmagent_manifests_invalid2.json | 10 ++ tests/data/test_waagent.conf | 111 +++++++++++++++++++++ 18 files changed, 240 insertions(+), 51 deletions(-) create mode 100644 tests/data/events/1478123456789000.tld create mode 100644 tests/data/events/1478123456789001.tld create mode 100644 tests/data/events/1479766858966718.tld create mode 100644 tests/data/ext/sample_ext-1.2.0.zip create mode 100644 tests/data/ext/sample_ext-1.2.0/HandlerManifest.json create mode 100755 tests/data/ext/sample_ext-1.2.0/sample.py delete mode 100644 tests/data/ext/sample_ext.zip delete mode 100644 tests/data/ext/sample_ext/HandlerManifest.json delete mode 100755 tests/data/ext/sample_ext/sample.py create mode 100644 tests/data/ga/WALinuxAgent-2.2.11.zip delete mode 100644 tests/data/ga/WALinuxAgent-2.2.8.zip create mode 100644 tests/data/ga/supported.json create mode 100644 tests/data/metadata/vmagent_manifest1.json create mode 100644 tests/data/metadata/vmagent_manifest2.json create mode 100644 tests/data/metadata/vmagent_manifests.json create mode 100644 tests/data/metadata/vmagent_manifests_invalid1.json create mode 100644 tests/data/metadata/vmagent_manifests_invalid2.json create mode 100644 tests/data/test_waagent.conf (limited to 'tests/data') diff --git a/tests/data/events/1478123456789000.tld b/tests/data/events/1478123456789000.tld new file mode 100644 index 0000000..a689f4c --- /dev/null +++ b/tests/data/events/1478123456789000.tld @@ -0,0 +1 @@ +{"eventId": 1, "providerId": "69B669B9-4AF8-4C50-BDC4-6006FA76E975", "parameters": [{"name": "Name", "value": "Test Event"}, {"name": "Version", "value": "2.2.0"}, {"name": "IsInternal", "value": false}, {"name": "Operation", "value": "Some Operation"}, {"name": "OperationSuccess", "value": true}, {"name": "Message", "value": ""}, {"name": "Duration", "value": 0}, {"name": "ExtensionType", "value": ""}]} \ No newline at end of file diff --git a/tests/data/events/1478123456789001.tld b/tests/data/events/1478123456789001.tld new file mode 100644 index 0000000..95460e3 --- /dev/null +++ b/tests/data/events/1478123456789001.tld @@ -0,0 +1 @@ +{"eventId": 1, "providerId": "69B669B9-4AF8-4C50-BDC4-6006FA76E975", "parameters": [{"name": "Name", "value": "Linux Event"}, {"name": "Version", "value": "2.2.0"}, {"name": "IsInternal", "value": false}, {"name": "Operation", "value": "Linux Operation"}, {"name": "OperationSuccess", "value": false}, {"name": "Message", "value": "Linux Message"}, {"name": "Duration", "value": 42}, {"name": "ExtensionType", "value": "Linux Event Type"}]} \ No newline at end of file diff --git a/tests/data/events/1479766858966718.tld b/tests/data/events/1479766858966718.tld new file mode 100644 index 0000000..cc7ac67 --- /dev/null +++ b/tests/data/events/1479766858966718.tld @@ -0,0 +1 @@ +{"eventId": 1, "providerId": "69B669B9-4AF8-4C50-BDC4-6006FA76E975", "parameters": [{"name": "Name", "value": "WALinuxAgent"}, {"name": "Version", "value": "2.3.0.1"}, {"name": "IsInternal", "value": false}, {"name": "Operation", "value": "Enable"}, {"name": "OperationSuccess", "value": true}, {"name": "Message", "value": "Agent WALinuxAgent-2.3.0.1 launched with command 'python install.py' is successfully running"}, {"name": "Duration", "value": 0}, {"name": "ExtensionType", "value": ""}]} \ No newline at end of file diff --git a/tests/data/ext/sample_ext-1.2.0.zip b/tests/data/ext/sample_ext-1.2.0.zip new file mode 100644 index 0000000..08cfaf7 Binary files /dev/null and b/tests/data/ext/sample_ext-1.2.0.zip differ diff --git a/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json b/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json new file mode 100644 index 0000000..9890d0c --- /dev/null +++ b/tests/data/ext/sample_ext-1.2.0/HandlerManifest.json @@ -0,0 +1,14 @@ +[{ + "name": "ExampleHandlerLinux", + "version": 1.0, + "handlerManifest": { + "installCommand": "sample.py -install", + "uninstallCommand": "sample.py -uninstall", + "updateCommand": "sample.py -update", + "enableCommand": "sample.py -enable", + "disableCommand": "sample.py -disable", + "rebootAfterInstall": false, + "reportHeartbeat": false + } +}] + diff --git a/tests/data/ext/sample_ext-1.2.0/sample.py b/tests/data/ext/sample_ext-1.2.0/sample.py new file mode 100755 index 0000000..74bd839 --- /dev/null +++ b/tests/data/ext/sample_ext-1.2.0/sample.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python + +import os + + +def get_seq(): + latest_seq = -1 + config_dir = os.path.join(os.getcwd(), "config") + if os.path.isdir(config_dir): + for item in os.listdir(config_dir): + item_path = os.path.join(config_dir, item) + if os.path.isfile(item_path): + separator = item.rfind(".") + if separator > 0 and item[separator + 1:] == "settings": + sequence = int(item[0: separator]) + if sequence > latest_seq: + latest_seq = sequence + return latest_seq + + +succeed_status = """ +[{ + "status": { + "status": "success" + } +}] +""" + +if __name__ == "__main__": + seq = get_seq() + if seq >= 0: + status_path = os.path.join(os.getcwd(), "status") + if not os.path.exists(status_path): + os.makedirs(status_path) + status_file = os.path.join(status_path, "{0}.status".format(seq)) + with open(status_file, "w+") as status: + status.write(succeed_status) diff --git a/tests/data/ext/sample_ext.zip b/tests/data/ext/sample_ext.zip deleted file mode 100644 index 08cfaf7..0000000 Binary files a/tests/data/ext/sample_ext.zip and /dev/null differ diff --git a/tests/data/ext/sample_ext/HandlerManifest.json b/tests/data/ext/sample_ext/HandlerManifest.json deleted file mode 100644 index 9890d0c..0000000 --- a/tests/data/ext/sample_ext/HandlerManifest.json +++ /dev/null @@ -1,14 +0,0 @@ -[{ - "name": "ExampleHandlerLinux", - "version": 1.0, - "handlerManifest": { - "installCommand": "sample.py -install", - "uninstallCommand": "sample.py -uninstall", - "updateCommand": "sample.py -update", - "enableCommand": "sample.py -enable", - "disableCommand": "sample.py -disable", - "rebootAfterInstall": false, - "reportHeartbeat": false - } -}] - diff --git a/tests/data/ext/sample_ext/sample.py b/tests/data/ext/sample_ext/sample.py deleted file mode 100755 index 74bd839..0000000 --- a/tests/data/ext/sample_ext/sample.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -import os - - -def get_seq(): - latest_seq = -1 - config_dir = os.path.join(os.getcwd(), "config") - if os.path.isdir(config_dir): - for item in os.listdir(config_dir): - item_path = os.path.join(config_dir, item) - if os.path.isfile(item_path): - separator = item.rfind(".") - if separator > 0 and item[separator + 1:] == "settings": - sequence = int(item[0: separator]) - if sequence > latest_seq: - latest_seq = sequence - return latest_seq - - -succeed_status = """ -[{ - "status": { - "status": "success" - } -}] -""" - -if __name__ == "__main__": - seq = get_seq() - if seq >= 0: - status_path = os.path.join(os.getcwd(), "status") - if not os.path.exists(status_path): - os.makedirs(status_path) - status_file = os.path.join(status_path, "{0}.status".format(seq)) - with open(status_file, "w+") as status: - status.write(succeed_status) diff --git a/tests/data/ga/WALinuxAgent-2.2.11.zip b/tests/data/ga/WALinuxAgent-2.2.11.zip new file mode 100644 index 0000000..f018116 Binary files /dev/null and b/tests/data/ga/WALinuxAgent-2.2.11.zip differ diff --git a/tests/data/ga/WALinuxAgent-2.2.8.zip b/tests/data/ga/WALinuxAgent-2.2.8.zip deleted file mode 100644 index 04c60a8..0000000 Binary files a/tests/data/ga/WALinuxAgent-2.2.8.zip and /dev/null differ diff --git a/tests/data/ga/supported.json b/tests/data/ga/supported.json new file mode 100644 index 0000000..2ae3753 --- /dev/null +++ b/tests/data/ga/supported.json @@ -0,0 +1,8 @@ +{ + "ubuntu.16.10-x64": { + "versions": [ + "^Ubuntu,16.10,yakkety$" + ], + "slice": 10 + } +} diff --git a/tests/data/metadata/vmagent_manifest1.json b/tests/data/metadata/vmagent_manifest1.json new file mode 100644 index 0000000..544a708 --- /dev/null +++ b/tests/data/metadata/vmagent_manifest1.json @@ -0,0 +1,20 @@ +{ + "versions": [ + { + "version": "2.2.8", + "uris": [ + { + "uri": "https: //notused.com/ga/WALinuxAgent-2.2.8.zip" + } + ] + }, + { + "version": "2.2.9", + "uris": [ + { + "uri": "https: //notused.com/ga/WALinuxAgent-2.2.9.zip" + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/data/metadata/vmagent_manifest2.json b/tests/data/metadata/vmagent_manifest2.json new file mode 100644 index 0000000..544a708 --- /dev/null +++ b/tests/data/metadata/vmagent_manifest2.json @@ -0,0 +1,20 @@ +{ + "versions": [ + { + "version": "2.2.8", + "uris": [ + { + "uri": "https: //notused.com/ga/WALinuxAgent-2.2.8.zip" + } + ] + }, + { + "version": "2.2.9", + "uris": [ + { + "uri": "https: //notused.com/ga/WALinuxAgent-2.2.9.zip" + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/data/metadata/vmagent_manifests.json b/tests/data/metadata/vmagent_manifests.json new file mode 100644 index 0000000..2628f89 --- /dev/null +++ b/tests/data/metadata/vmagent_manifests.json @@ -0,0 +1,7 @@ +{ + "versionsManifestUris" : + [ + { "uri" : "https://notused.com/vmagent_manifest1.json" }, + { "uri" : "https://notused.com/vmagent_manifest2.json" } + ] +} diff --git a/tests/data/metadata/vmagent_manifests_invalid1.json b/tests/data/metadata/vmagent_manifests_invalid1.json new file mode 100644 index 0000000..55b08d1 --- /dev/null +++ b/tests/data/metadata/vmagent_manifests_invalid1.json @@ -0,0 +1,10 @@ +{ + "notTheRightKey": [ + { + "uri": "https://notused.com/vmagent_manifest1.json" + }, + { + "uri": "https://notused.com/vmagent_manifest2.json" + } + ] +} \ No newline at end of file diff --git a/tests/data/metadata/vmagent_manifests_invalid2.json b/tests/data/metadata/vmagent_manifests_invalid2.json new file mode 100644 index 0000000..5df4252 --- /dev/null +++ b/tests/data/metadata/vmagent_manifests_invalid2.json @@ -0,0 +1,10 @@ +{ + "notTheRightKey": [ + { + "foo": "https://notused.com/vmagent_manifest1.json" + }, + { + "bar": "https://notused.com/vmagent_manifest2.json" + } + ] +} \ No newline at end of file diff --git a/tests/data/test_waagent.conf b/tests/data/test_waagent.conf new file mode 100644 index 0000000..6368c39 --- /dev/null +++ b/tests/data/test_waagent.conf @@ -0,0 +1,111 @@ +# +# Microsoft Azure Linux Agent Configuration +# + +# Key / value handling test entries +=Value0 +FauxKey1= Value1 +FauxKey2=Value2 Value2 + +# Enable instance creation +Provisioning.Enabled=y + +# Rely on cloud-init to provision +Provisioning.UseCloudInit=y + +# Password authentication for root account will be unavailable. +Provisioning.DeleteRootPassword=y + +# Generate fresh host key pair. +Provisioning.RegenerateSshHostKeyPair=y + +# Supported values are "rsa", "dsa" and "ecdsa". +Provisioning.SshHostKeyPairType=rsa + +# Monitor host name changes and publish changes via DHCP requests. +Provisioning.MonitorHostName=y + +# Decode CustomData from Base64. +Provisioning.DecodeCustomData=n + +# Execute CustomData after provisioning. +Provisioning.ExecuteCustomData=n + +# Algorithm used by crypt when generating password hash. +#Provisioning.PasswordCryptId=6 + +# Length of random salt used when generating password hash. +#Provisioning.PasswordCryptSaltLength=10 + +# Allow reset password of sys user +Provisioning.AllowResetSysUser=n + +# Format if unformatted. If 'n', resource disk will not be mounted. +ResourceDisk.Format=y + +# File system on the resource disk +# Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. +ResourceDisk.Filesystem=ext4 + +# Mount point for the resource disk +ResourceDisk.MountPoint=/mnt/resource + +# Create and use swapfile on resource disk. +ResourceDisk.EnableSwap=n + +# Size of the swapfile. +ResourceDisk.SwapSizeMB=0 + +# Comma-seperated list of mount options. See man(8) for valid options. +ResourceDisk.MountOptions=None + +# Enable verbose logging (y|n) +Logs.Verbose=n + +# Is FIPS enabled +OS.EnableFIPS=y + +# Root device timeout in seconds. +OS.RootDeviceScsiTimeout=300 + +# If "None", the system default version is used. +OS.OpensslPath=None + +# Set the path to SSH keys and configuration files +OS.SshDir=/notareal/path + +# If set, agent will use proxy server to access internet +#HttpProxy.Host=None +#HttpProxy.Port=None + +# Detect Scvmm environment, default is n +# DetectScvmmEnv=n + +# +# Lib.Dir=/var/lib/waagent + +# +# DVD.MountPoint=/mnt/cdrom/secure + +# +# Pid.File=/var/run/waagent.pid + +# +# Extension.LogDir=/var/log/azure + +# +# Home.Dir=/home + +# Enable RDMA management and set up, should only be used in HPC images +# OS.EnableRDMA=y + +# Enable or disable goal state processing auto-update, default is enabled +# AutoUpdate.Enabled=y + +# Determine the update family, this should not be changed +# AutoUpdate.GAFamily=Prod + +# Determine if the overprovisioning feature is enabled. If yes, hold extension +# handling until inVMArtifactsProfile.OnHold is false. +# Default is disabled +# EnableOverProvisioning=n -- cgit v1.2.3