diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..f79fae7 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,23 @@ +--- +kind: pipeline +name: default +type: docker + +steps: + - name: test + image: eclipse-temurin:8-jdk + commands: + - ./gradlew test + - name: build + image: eclipse-temurin:8-jdk + environment: + AUTH_TOKEN: # Gitea access token ENV variable + from_secret: auth # Name of DroneCI secret exposed above + commands: + - ./gradlew build packages + - for file in build/libs/*-all.jar ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + when: + event: + - tag diff --git a/README.md b/README.md index 0b889ad..d6ec532 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Some of my other related projects are: - [hmci](https://bitbucket.org/mnellemann/hmci) for agent-less monitoring of IBM Power servers - [sysmon](https://bitbucket.org/mnellemann/sysmon) for monitoring all types of servers with a small Java agent -- [syslogd](https://bitbucket.org/mnellemann/syslogd) for redirecting syslog and GELF to remote logging destinations +- [syslogd](https://git.data.coop/nellemann/syslogd) for redirecting syslog and GELF to remote logging destinations ## Installation and Setup diff --git a/build.gradle b/build.gradle index 5f135a6..0c52ca2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ plugins { // Code coverage of tests id 'jacoco' - id "com.github.johnrengelman.shadow" version "7.1.2" id "net.nemerosa.versioning" version "2.15.1" - id "nebula.ospackage" version "9.1.1" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.netflix.nebula.ospackage" version "10.0.0" } repositories { @@ -24,8 +24,8 @@ dependencies { implementation 'info.picocli:picocli:4.7.0' implementation 'org.influxdb:influxdb-java:2.23' //implementation 'com.influxdb:influxdb-client-java:6.7.0' - implementation 'org.slf4j:slf4j-api:2.0.5' - implementation 'org.slf4j:slf4j-simple:2.0.5' + implementation 'org.slf4j:slf4j-api:2.0.6' + implementation 'org.slf4j:slf4j-simple:2.0.6' implementation 'com.squareup.okhttp3:okhttp:4.10.0' // Also used by InfluxDB Client //implementation "org.eclipse.jetty:jetty-client:9.4.49.v20220914" implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1' @@ -51,8 +51,6 @@ test { useJUnitPlatform() } - -apply plugin: 'nebula.ospackage' ospackage { packageName = 'svci' release = '1' @@ -128,7 +126,7 @@ jar { } } -tasks.create("packages") { +tasks.register("packages") { group "build" dependsOn ":build" dependsOn ":buildDeb" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..f127cfd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/biz/nellemann/svci/CapacityToDoubleConverter.java b/src/main/java/biz/nellemann/svci/CapacityToDoubleConverter.java index 8d43c48..0b93085 100644 --- a/src/main/java/biz/nellemann/svci/CapacityToDoubleConverter.java +++ b/src/main/java/biz/nellemann/svci/CapacityToDoubleConverter.java @@ -30,7 +30,7 @@ public class CapacityToDoubleConverter extends StdConverter { log.debug("Input: {} {}", input, unit); double output = input; - switch (unit) { + switch (unit.toUpperCase()) { case "PB": output = input * 1000; break; diff --git a/src/test/groovy/biz/nellemann/svci/CapacityToDoubleConverterTest.groovy b/src/test/groovy/biz/nellemann/svci/CapacityToDoubleConverterTest.groovy index 67c7e2a..f8ae17c 100644 --- a/src/test/groovy/biz/nellemann/svci/CapacityToDoubleConverterTest.groovy +++ b/src/test/groovy/biz/nellemann/svci/CapacityToDoubleConverterTest.groovy @@ -26,6 +26,13 @@ class CapacityToDoubleConverterTest extends Specification { result == 1024000.0 } + def "convert from PB (lowercase) String to TB Double"() { + when: + def result = converter.convert("1024.0pb") + + then: + result == 1024000.0 + } def "convert from GB String to TB Double"() { when: diff --git a/src/test/resources/json/v8.5/lsdrive_8.5.2.2 .json b/src/test/resources/json/v8.5/lsdrive_8.5.2.2 .json new file mode 100644 index 0000000..b1219f2 --- /dev/null +++ b/src/test/resources/json/v8.5/lsdrive_8.5.2.2 .json @@ -0,0 +1,206 @@ +[ + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "0", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "0", + "node_id" : "", + "node_name" : "", + "slot_id" : "7", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "1", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "1", + "node_id" : "", + "node_name" : "", + "slot_id" : "6", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "2", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "2", + "node_id" : "", + "node_name" : "", + "slot_id" : "2", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "3", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "3", + "node_id" : "", + "node_name" : "", + "slot_id" : "8", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "4", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "4", + "node_id" : "", + "node_name" : "", + "slot_id" : "9", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "5", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "5", + "node_id" : "", + "node_name" : "", + "slot_id" : "3", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "6", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "6", + "node_id" : "", + "node_name" : "", + "slot_id" : "5", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "7", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "7", + "node_id" : "", + "node_name" : "", + "slot_id" : "4", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "8", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "8", + "node_id" : "", + "node_name" : "", + "slot_id" : "1", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "9", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "9", + "node_id" : "", + "node_name" : "", + "slot_id" : "10", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "10", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "10", + "node_id" : "", + "node_name" : "", + "slot_id" : "11", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + }, + { + "auto_manage" : "inactive", + "capacity" : "20.0TB", + "drive_class_id" : "0", + "enclosure_id" : "1", + "error_sequence_number" : "", + "id" : "11", + "mdisk_id" : "0", + "mdisk_name" : "MDisk1", + "member_id" : "11", + "node_id" : "", + "node_name" : "", + "slot_id" : "12", + "status" : "online", + "tech_type" : "tier0_flash", + "use" : "member" + } +] diff --git a/src/test/resources/json/v8.5/lsenclosurepsu_8.5.2.2 .json b/src/test/resources/json/v8.5/lsenclosurepsu_8.5.2.2 .json new file mode 100644 index 0000000..801a032 --- /dev/null +++ b/src/test/resources/json/v8.5/lsenclosurepsu_8.5.2.2 .json @@ -0,0 +1,14 @@ +[ + { + "PSU_id" : "1", + "enclosure_id" : "1", + "input_power" : "ac_highline", + "status" : "online" + }, + { + "PSU_id" : "2", + "enclosure_id" : "1", + "input_power" : "ac_highline", + "status" : "online" + } +] diff --git a/src/test/resources/json/v8.5/lsenclosurestats_8.5.2.2 .json b/src/test/resources/json/v8.5/lsenclosurestats_8.5.2.2 .json new file mode 100644 index 0000000..0aa47ed --- /dev/null +++ b/src/test/resources/json/v8.5/lsenclosurestats_8.5.2.2 .json @@ -0,0 +1,23 @@ +[ + { + "enclosure_id" : "1", + "stat_current" : "475", + "stat_name" : "power_w", + "stat_peak" : "475", + "stat_peak_time" : "221218114925" + }, + { + "enclosure_id" : "1", + "stat_current" : "22", + "stat_name" : "temp_c", + "stat_peak" : "22", + "stat_peak_time" : "221218114925" + }, + { + "enclosure_id" : "1", + "stat_current" : "71", + "stat_name" : "temp_f", + "stat_peak" : "71", + "stat_peak_time" : "221218114925" + } +] diff --git a/src/test/resources/json/v8.5/lshost_8.5.2.2 .json b/src/test/resources/json/v8.5/lshost_8.5.2.2 .json new file mode 100644 index 0000000..abfd4b6 --- /dev/null +++ b/src/test/resources/json/v8.5/lshost_8.5.2.2 .json @@ -0,0 +1,50 @@ +[ + { + "host_cluster_id" : "", + "host_cluster_name" : "", + "id" : "0", + "iogrp_count" : "4", + "name" : "x3690-x5-01", + "owner_id" : "", + "owner_name" : "", + "port_count" : "2", + "portset_id" : "64", + "portset_name" : "portset64", + "protocol" : "scsi", + "site_id" : "", + "site_name" : "", + "status" : "online" + }, + { + "host_cluster_id" : "", + "host_cluster_name" : "", + "id" : "1", + "iogrp_count" : "4", + "name" : "VMware_202", + "owner_id" : "", + "owner_name" : "", + "port_count" : "1", + "portset_id" : "0", + "portset_name" : "portset0", + "protocol" : "rdmanvme", + "site_id" : "", + "site_name" : "", + "status" : "online" + }, + { + "host_cluster_id" : "", + "host_cluster_name" : "", + "id" : "2", + "iogrp_count" : "4", + "name" : "x3690_x5_04", + "owner_id" : "", + "owner_name" : "", + "port_count" : "2", + "portset_id" : "64", + "portset_name" : "portset64", + "protocol" : "scsi", + "site_id" : "", + "site_name" : "", + "status" : "online" + } +] diff --git a/src/test/resources/json/v8.5/lsmdiskgrp_8.5.2.2 .json b/src/test/resources/json/v8.5/lsmdiskgrp_8.5.2.2 .json new file mode 100644 index 0000000..a302cab --- /dev/null +++ b/src/test/resources/json/v8.5/lsmdiskgrp_8.5.2.2 .json @@ -0,0 +1,170 @@ +[ + { + "capacity" : "178.90TB", + "child_mdisk_grp_capacity" : "0.00MB", + "child_mdisk_grp_count" : "3", + "compression_active" : "no", + "compression_compressed_capacity" : "0.00MB", + "compression_uncompressed_capacity" : "0.00MB", + "compression_virtual_capacity" : "0.00MB", + "data_reduction" : "yes", + "deduplication_capacity_saving" : "55.70GB", + "easy_tier" : "auto", + "easy_tier_fcm_over_allocation_max" : "100%", + "easy_tier_status" : "balanced", + "encrypt" : "no", + "extent_size" : "4096", + "free_capacity" : "174.75TB", + "id" : "0", + "mdisk_count" : "1", + "name" : "DRP_Pool0", + "overallocation" : "1", + "overhead_capacity" : "1.79TB", + "owner_id" : "", + "owner_name" : "", + "owner_type" : "none", + "parent_mdisk_grp_id" : "0", + "parent_mdisk_grp_name" : "DRP_Pool0", + "provisioning_policy_id" : "", + "provisioning_policy_name" : "", + "real_capacity" : "3.05TB", + "reclaimable_capacity" : "2.30GB", + "replication_pool_link_uid" : "000000000000120500000202E161FF90", + "site_id" : "", + "site_name" : "", + "status" : "online", + "type" : "parent", + "used_capacity" : "3.03TB", + "used_capacity_after_reduction" : "150.44GB", + "used_capacity_before_reduction" : "87.95GB", + "vdisk_count" : "18", + "virtual_capacity" : "1.78TB", + "warning" : "80" + }, + { + "capacity" : "178.90TB", + "child_mdisk_grp_capacity" : "0.00MB", + "child_mdisk_grp_count" : "0", + "compression_active" : "no", + "compression_compressed_capacity" : "0.00MB", + "compression_uncompressed_capacity" : "0.00MB", + "compression_virtual_capacity" : "0.00MB", + "data_reduction" : "yes", + "deduplication_capacity_saving" : "0.00MB", + "easy_tier" : "auto", + "easy_tier_fcm_over_allocation_max" : "100%", + "easy_tier_status" : "balanced", + "encrypt" : "no", + "extent_size" : "4096", + "free_capacity" : "174.75TB", + "id" : "1", + "mdisk_count" : "0", + "name" : "Backup_0", + "overallocation" : "0", + "overhead_capacity" : "0.00MB", + "owner_id" : "", + "owner_name" : "", + "owner_type" : "safeguarded_copy", + "parent_mdisk_grp_id" : "0", + "parent_mdisk_grp_name" : "DRP_Pool0", + "provisioning_policy_id" : "", + "provisioning_policy_name" : "", + "real_capacity" : "0.00MB", + "reclaimable_capacity" : "0.00MB", + "replication_pool_link_uid" : "000000000000120600000202E161FF90", + "site_id" : "", + "site_name" : "", + "status" : "online", + "type" : "child_quotaless", + "used_capacity" : "0.00MB", + "used_capacity_after_reduction" : "0.00MB", + "used_capacity_before_reduction" : "0.00MB", + "vdisk_count" : "0", + "virtual_capacity" : "0.00MB", + "warning" : "80" + }, + { + "capacity" : "178.90TB", + "child_mdisk_grp_capacity" : "0.00MB", + "child_mdisk_grp_count" : "0", + "compression_active" : "no", + "compression_compressed_capacity" : "0.00MB", + "compression_uncompressed_capacity" : "0.00MB", + "compression_virtual_capacity" : "0.00MB", + "data_reduction" : "yes", + "deduplication_capacity_saving" : "0.00MB", + "easy_tier" : "auto", + "easy_tier_fcm_over_allocation_max" : "100%", + "easy_tier_status" : "balanced", + "encrypt" : "no", + "extent_size" : "4096", + "free_capacity" : "174.75TB", + "id" : "2", + "mdisk_count" : "0", + "name" : "Application", + "overallocation" : "0", + "overhead_capacity" : "0.00MB", + "owner_id" : "", + "owner_name" : "", + "owner_type" : "none", + "parent_mdisk_grp_id" : "0", + "parent_mdisk_grp_name" : "DRP_Pool0", + "provisioning_policy_id" : "2", + "provisioning_policy_name" : "Compression_Deduplication", + "real_capacity" : "0.00MB", + "reclaimable_capacity" : "0.00MB", + "replication_pool_link_uid" : "000000000000127700000202E161FF90", + "site_id" : "", + "site_name" : "", + "status" : "online", + "type" : "child_quotaless", + "used_capacity" : "0.00MB", + "used_capacity_after_reduction" : "0.00MB", + "used_capacity_before_reduction" : "0.00MB", + "vdisk_count" : "17", + "virtual_capacity" : "153.00GB", + "warning" : "80" + }, + { + "capacity" : "178.90TB", + "child_mdisk_grp_capacity" : "0.00MB", + "child_mdisk_grp_count" : "0", + "compression_active" : "no", + "compression_compressed_capacity" : "0.00MB", + "compression_uncompressed_capacity" : "0.00MB", + "compression_virtual_capacity" : "0.00MB", + "data_reduction" : "yes", + "deduplication_capacity_saving" : "0.00MB", + "easy_tier" : "auto", + "easy_tier_fcm_over_allocation_max" : "100%", + "easy_tier_status" : "balanced", + "encrypt" : "no", + "extent_size" : "4096", + "free_capacity" : "174.75TB", + "id" : "3", + "mdisk_count" : "0", + "name" : "DRP_CPool_3", + "overallocation" : "0", + "overhead_capacity" : "0.00MB", + "owner_id" : "", + "owner_name" : "", + "owner_type" : "none", + "parent_mdisk_grp_id" : "0", + "parent_mdisk_grp_name" : "DRP_Pool0", + "provisioning_policy_id" : "1", + "provisioning_policy_name" : "Dedup_Comp", + "real_capacity" : "0.00MB", + "reclaimable_capacity" : "0.00MB", + "replication_pool_link_uid" : "00000000000003DA00000204A040026C", + "site_id" : "", + "site_name" : "", + "status" : "online", + "type" : "child_quotaless", + "used_capacity" : "0.00MB", + "used_capacity_after_reduction" : "0.00MB", + "used_capacity_before_reduction" : "0.00MB", + "vdisk_count" : "8", + "virtual_capacity" : "860.00GB", + "warning" : "80" + } +] diff --git a/src/test/resources/json/v8.5/lsnode_8.5.2.2 .json b/src/test/resources/json/v8.5/lsnode_8.5.2.2 .json new file mode 100644 index 0000000..edf485a --- /dev/null +++ b/src/test/resources/json/v8.5/lsnode_8.5.2.2 .json @@ -0,0 +1,42 @@ +[ + { + "IO_group_id" : "0", + "IO_group_name" : "io_grp0", + "UPS_serial_number" : "", + "UPS_unique_id" : "", + "WWNN" : "500507680B00FFC8", + "canister_id" : "1", + "config_node" : "yes", + "enclosure_id" : "1", + "enclosure_serial_number" : "78F1073", + "hardware" : "6H2", + "id" : "1", + "iscsi_alias" : "", + "iscsi_name" : "iqn.1986-03.com.ibm:2145.fs-5200-1.node1", + "name" : "node1", + "panel_name" : "01-1", + "site_id" : "", + "site_name" : "", + "status" : "online" + }, + { + "IO_group_id" : "0", + "IO_group_name" : "io_grp0", + "UPS_serial_number" : "", + "UPS_unique_id" : "", + "WWNN" : "500507680B00FFC9", + "canister_id" : "2", + "config_node" : "no", + "enclosure_id" : "1", + "enclosure_serial_number" : "78F1073", + "hardware" : "6H2", + "id" : "2", + "iscsi_alias" : "", + "iscsi_name" : "iqn.1986-03.com.ibm:2145.fs-5200-1.node2", + "name" : "node2", + "panel_name" : "01-2", + "site_id" : "", + "site_name" : "", + "status" : "online" + } +] diff --git a/src/test/resources/json/v8.5/lsnodecanisterstats_8.5.2.2 .json b/src/test/resources/json/v8.5/lsnodecanisterstats_8.5.2.2 .json new file mode 100644 index 0000000..54b0372 --- /dev/null +++ b/src/test/resources/json/v8.5/lsnodecanisterstats_8.5.2.2 .json @@ -0,0 +1,738 @@ +[ + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "compression_cpu_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "6", + "stat_name" : "cpu_pc", + "stat_peak" : "6", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "fc_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "1970", + "stat_name" : "fc_io", + "stat_peak" : "2172", + "stat_peak_time" : "221218114529" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "sas_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "sas_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iscsi_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iscsi_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "write_cache_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "79", + "stat_name" : "total_cache_pc", + "stat_peak" : "79", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "304", + "stat_name" : "drive_mb", + "stat_peak" : "459", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "1212", + "stat_name" : "drive_io", + "stat_peak" : "1829", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.322", + "stat_name" : "drive_ms", + "stat_peak" : "0.536", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "304", + "stat_name" : "drive_r_mb", + "stat_peak" : "459", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "1212", + "stat_name" : "drive_r_io", + "stat_peak" : "1829", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.322", + "stat_name" : "drive_r_ms", + "stat_peak" : "0.536", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "drive_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "drive_w_io", + "stat_peak" : "5", + "stat_peak_time" : "221218114830" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "drive_w_ms", + "stat_peak" : "0.055", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iplink_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "202", + "stat_name" : "iplink_io", + "stat_peak" : "444", + "stat_peak_time" : "221218114504" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iplink_comp_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_up_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_up_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_down_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_down_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iser_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iser_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114925" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "compression_cpu_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "5", + "stat_name" : "cpu_pc", + "stat_peak" : "6", + "stat_peak_time" : "221218114541" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "fc_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "1924", + "stat_name" : "fc_io", + "stat_peak" : "2130", + "stat_peak_time" : "221218114826" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "sas_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "sas_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iscsi_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iscsi_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "write_cache_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "79", + "stat_name" : "total_cache_pc", + "stat_peak" : "79", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_mb", + "stat_peak" : "50", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_io", + "stat_peak" : "202", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_ms", + "stat_peak" : "0.606", + "stat_peak_time" : "221218114821" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_r_mb", + "stat_peak" : "50", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_r_io", + "stat_peak" : "202", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_r_ms", + "stat_peak" : "0.606", + "stat_peak_time" : "221218114821" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iplink_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "470", + "stat_name" : "iplink_io", + "stat_peak" : "620", + "stat_peak_time" : "221218114516" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iplink_comp_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_up_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_up_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_down_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_down_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iser_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iser_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + } +] diff --git a/src/test/resources/json/v8.5/lsnodestats_8.5.2.2 .json b/src/test/resources/json/v8.5/lsnodestats_8.5.2.2 .json new file mode 100644 index 0000000..094c815 --- /dev/null +++ b/src/test/resources/json/v8.5/lsnodestats_8.5.2.2 .json @@ -0,0 +1,738 @@ +[ + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "compression_cpu_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "6", + "stat_name" : "cpu_pc", + "stat_peak" : "6", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "fc_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "2115", + "stat_name" : "fc_io", + "stat_peak" : "2172", + "stat_peak_time" : "221218114529" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "sas_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "sas_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iscsi_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iscsi_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "write_cache_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "79", + "stat_name" : "total_cache_pc", + "stat_peak" : "79", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "397", + "stat_name" : "drive_mb", + "stat_peak" : "459", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "1581", + "stat_name" : "drive_io", + "stat_peak" : "1829", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.379", + "stat_name" : "drive_ms", + "stat_peak" : "0.536", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "vdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "vdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "mdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "mdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "397", + "stat_name" : "drive_r_mb", + "stat_peak" : "459", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "1581", + "stat_name" : "drive_r_io", + "stat_peak" : "1829", + "stat_peak_time" : "221218114449" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.379", + "stat_name" : "drive_r_ms", + "stat_peak" : "0.536", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "drive_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "drive_w_io", + "stat_peak" : "5", + "stat_peak_time" : "221218114830" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0.000", + "stat_name" : "drive_w_ms", + "stat_peak" : "0.055", + "stat_peak_time" : "221218114800" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iplink_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "120", + "stat_name" : "iplink_io", + "stat_peak" : "444", + "stat_peak_time" : "221218114504" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iplink_comp_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_up_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_up_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_down_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "cloud_down_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iser_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "1", + "node_name" : "node1", + "stat_current" : "0", + "stat_name" : "iser_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114920" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "compression_cpu_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "5", + "stat_name" : "cpu_pc", + "stat_peak" : "6", + "stat_peak_time" : "221218114541" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "fc_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "1924", + "stat_name" : "fc_io", + "stat_peak" : "2130", + "stat_peak_time" : "221218114826" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "sas_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "sas_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iscsi_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iscsi_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "write_cache_pc", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "79", + "stat_name" : "total_cache_pc", + "stat_peak" : "79", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_mb", + "stat_peak" : "50", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_io", + "stat_peak" : "202", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_ms", + "stat_peak" : "0.606", + "stat_peak_time" : "221218114821" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "vdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "vdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_r_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_r_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_r_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "mdisk_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "mdisk_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_r_mb", + "stat_peak" : "50", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_r_io", + "stat_peak" : "202", + "stat_peak_time" : "221218114546" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_r_ms", + "stat_peak" : "0.606", + "stat_peak_time" : "221218114821" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_w_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "drive_w_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0.000", + "stat_name" : "drive_w_ms", + "stat_peak" : "0.000", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iplink_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "470", + "stat_name" : "iplink_io", + "stat_peak" : "620", + "stat_peak_time" : "221218114516" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iplink_comp_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_up_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_up_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_down_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "cloud_down_ms", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iser_mb", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + }, + { + "node_id" : "2", + "node_name" : "node2", + "stat_current" : "0", + "stat_name" : "iser_io", + "stat_peak" : "0", + "stat_peak_time" : "221218114921" + } +] diff --git a/src/test/resources/json/v8.5/lsportfc_8.5.2.2 .json b/src/test/resources/json/v8.5/lsportfc_8.5.2.2 .json new file mode 100644 index 0000000..58787f8 --- /dev/null +++ b/src/test/resources/json/v8.5/lsportfc_8.5.2.2 .json @@ -0,0 +1,66 @@ +[ + { + "WWPN" : "500507680B11FFC8", + "adapter_location" : "1", + "adapter_port_id" : "1", + "attachment" : "switch", + "cluster_use" : "local_partner", + "fc_io_port_id" : "1", + "id" : "0", + "node_id" : "1", + "node_name" : "node1", + "nportid" : "012200", + "port_id" : "1", + "port_speed" : "32Gb", + "status" : "active", + "type" : "fc" + }, + { + "WWPN" : "500507680B12FFC8", + "adapter_location" : "1", + "adapter_port_id" : "2", + "attachment" : "switch", + "cluster_use" : "local_partner", + "fc_io_port_id" : "2", + "id" : "1", + "node_id" : "1", + "node_name" : "node1", + "nportid" : "011D00", + "port_id" : "2", + "port_speed" : "32Gb", + "status" : "active", + "type" : "fc" + }, + { + "WWPN" : "500507680B11FFC9", + "adapter_location" : "1", + "adapter_port_id" : "1", + "attachment" : "switch", + "cluster_use" : "local_partner", + "fc_io_port_id" : "1", + "id" : "24", + "node_id" : "2", + "node_name" : "node2", + "nportid" : "012000", + "port_id" : "1", + "port_speed" : "32Gb", + "status" : "active", + "type" : "fc" + }, + { + "WWPN" : "500507680B12FFC9", + "adapter_location" : "1", + "adapter_port_id" : "2", + "attachment" : "switch", + "cluster_use" : "local_partner", + "fc_io_port_id" : "2", + "id" : "25", + "node_id" : "2", + "node_name" : "node2", + "nportid" : "011F00", + "port_id" : "2", + "port_speed" : "32Gb", + "status" : "active", + "type" : "fc" + } +] diff --git a/src/test/resources/json/v8.5/lsportip_8.5.2.2 .json b/src/test/resources/json/v8.5/lsportip_8.5.2.2 .json new file mode 100644 index 0000000..9bd01f6 --- /dev/null +++ b/src/test/resources/json/v8.5/lsportip_8.5.2.2 .json @@ -0,0 +1,514 @@ +[ + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "1", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "1", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "2", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "2", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "3", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "3", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "4", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "4", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "1", + "node_name" : "node1", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "1", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "1", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "2", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "2", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "3", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "3", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "no", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "4", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + }, + { + "IP_address" : "", + "IP_address_6" : "", + "MAC" : "ff:ff:ff:ff:ff:ff", + "adapter_location" : "0", + "adapter_port_id" : "1", + "duplex" : "Full", + "failover" : "yes", + "gateway" : "", + "gateway_6" : "", + "host" : "", + "host_6" : "", + "host_port_grp_id" : "0", + "id" : "4", + "is_rdma_clustering" : "no", + "link_state" : "inactive", + "mask" : "", + "node_id" : "2", + "node_name" : "node2", + "prefix_6" : "", + "rdma_type" : "", + "remote_copy" : "0", + "remote_copy_6" : "0", + "remote_copy_status" : "", + "remote_copy_status_6" : "", + "speed" : "1Gb/s", + "state" : "unconfigured", + "storage" : "", + "storage_6" : "", + "vlan" : "", + "vlan_6" : "" + } +] diff --git a/src/test/resources/json/v8.5/lsquorum_8.5.2.2 .json b/src/test/resources/json/v8.5/lsquorum_8.5.2.2 .json new file mode 100644 index 0000000..1eb7b5c --- /dev/null +++ b/src/test/resources/json/v8.5/lsquorum_8.5.2.2 .json @@ -0,0 +1,41 @@ +[ + { + "active" : "no", + "controller_id" : "", + "controller_name" : "", + "id" : "4", + "name" : "", + "object_type" : "drive", + "override" : "no", + "quorum_index" : "0", + "site_id" : "", + "site_name" : "", + "status" : "online" + }, + { + "active" : "yes", + "controller_id" : "", + "controller_name" : "", + "id" : "0", + "name" : "", + "object_type" : "drive", + "override" : "no", + "quorum_index" : "1", + "site_id" : "", + "site_name" : "", + "status" : "online" + }, + { + "active" : "no", + "controller_id" : "", + "controller_name" : "", + "id" : "3", + "name" : "", + "object_type" : "drive", + "override" : "no", + "quorum_index" : "2", + "site_id" : "", + "site_name" : "", + "status" : "online" + } +]