From 360a9a61ac97c38d950269ffde212589e5eb71b3 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Tue, 18 Aug 2020 13:49:48 +0200 Subject: [PATCH] Added LICENSE information --- LICENSE | 202 ++++++++++++++++++ src/main/groovy/biz/nellemann/hmci/App.groovy | 15 ++ .../biz/nellemann/hmci/HmcClient.groovy | 15 ++ .../biz/nellemann/hmci/InfluxClient.groovy | 15 ++ .../nellemann/hmci/LogicalPartition.groovy | 15 ++ .../biz/nellemann/hmci/ManagedSystem.groovy | 17 +- .../biz/nellemann/hmci/MetaSystem.groovy | 17 +- .../{pojo => pcm}/FiberChannelAdapter.groovy | 2 +- .../hmci/{pojo => pcm}/GenericAdapter.groovy | 2 +- .../GenericPhysicalAdapters.groovy | 2 +- .../GenericVirtualAdapter.groovy | 2 +- .../hmci/{pojo => pcm}/LparMemory.groovy | 2 +- .../hmci/{pojo => pcm}/LparProcessor.groovy | 2 +- .../hmci/{pojo => pcm}/LparUtil.groovy | 2 +- .../hmci/{pojo => pcm}/Network.groovy | 2 +- .../hmci/{pojo => pcm}/PcmData.groovy | 2 +- .../PhysicalProcessorPool.groovy | 2 +- .../hmci/{pojo => pcm}/SampleInfo.groovy | 2 +- .../hmci/{pojo => pcm}/ServerMemory.groovy | 2 +- .../hmci/{pojo => pcm}/ServerProcessor.groovy | 2 +- .../hmci/{pojo => pcm}/ServerUtil.groovy | 2 +- .../hmci/{pojo => pcm}/SharedAdapter.groovy | 2 +- .../{pojo => pcm}/SharedProcessorPool.groovy | 2 +- .../hmci/{pojo => pcm}/Storage.groovy | 2 +- .../hmci/{pojo => pcm}/SystemUtil.groovy | 2 +- .../hmci/{pojo => pcm}/UtilInfo.groovy | 4 +- .../hmci/{pojo => pcm}/UtilSample.groovy | 2 +- .../hmci/{pojo => pcm}/ViosUtil.groovy | 2 +- .../VirtualEthernetAdapter.groovy | 2 +- .../VirtualFiberChannelAdapter.groovy | 2 +- .../nellemann/hmci/ManagedSystemTest.groovy | 15 ++ .../biz/nellemann/hmci/MetaSystemTest.groovy | 1 + 32 files changed, 333 insertions(+), 27 deletions(-) create mode 100644 LICENSE rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/FiberChannelAdapter.groovy (91%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/GenericAdapter.groovy (91%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/GenericPhysicalAdapters.groovy (90%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/GenericVirtualAdapter.groovy (90%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/LparMemory.groovy (81%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/LparProcessor.groovy (94%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/LparUtil.groovy (89%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/Network.groovy (86%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/PcmData.groovy (73%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/PhysicalProcessorPool.groovy (89%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/SampleInfo.groovy (77%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/ServerMemory.groovy (86%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/ServerProcessor.groovy (87%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/ServerUtil.groovy (87%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/SharedAdapter.groovy (92%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/SharedProcessorPool.groovy (90%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/Storage.groovy (90%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/SystemUtil.groovy (79%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/UtilInfo.groovy (81%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/UtilSample.groovy (86%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/ViosUtil.groovy (91%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/VirtualEthernetAdapter.groovy (95%) rename src/main/groovy/biz/nellemann/hmci/{pojo => pcm}/VirtualFiberChannelAdapter.groovy (92%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/src/main/groovy/biz/nellemann/hmci/App.groovy b/src/main/groovy/biz/nellemann/hmci/App.groovy index 80c5366..f9b83f8 100644 --- a/src/main/groovy/biz/nellemann/hmci/App.groovy +++ b/src/main/groovy/biz/nellemann/hmci/App.groovy @@ -1,3 +1,18 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci import groovy.cli.picocli.CliBuilder diff --git a/src/main/groovy/biz/nellemann/hmci/HmcClient.groovy b/src/main/groovy/biz/nellemann/hmci/HmcClient.groovy index 50f9245..7f9d869 100644 --- a/src/main/groovy/biz/nellemann/hmci/HmcClient.groovy +++ b/src/main/groovy/biz/nellemann/hmci/HmcClient.groovy @@ -1,3 +1,18 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci import groovy.util.logging.Slf4j diff --git a/src/main/groovy/biz/nellemann/hmci/InfluxClient.groovy b/src/main/groovy/biz/nellemann/hmci/InfluxClient.groovy index c8620c3..6d5b14c 100644 --- a/src/main/groovy/biz/nellemann/hmci/InfluxClient.groovy +++ b/src/main/groovy/biz/nellemann/hmci/InfluxClient.groovy @@ -1,3 +1,18 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci import groovy.util.logging.Slf4j diff --git a/src/main/groovy/biz/nellemann/hmci/LogicalPartition.groovy b/src/main/groovy/biz/nellemann/hmci/LogicalPartition.groovy index fd0300b..61831b5 100644 --- a/src/main/groovy/biz/nellemann/hmci/LogicalPartition.groovy +++ b/src/main/groovy/biz/nellemann/hmci/LogicalPartition.groovy @@ -1,3 +1,18 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci import groovy.util.logging.Slf4j diff --git a/src/main/groovy/biz/nellemann/hmci/ManagedSystem.groovy b/src/main/groovy/biz/nellemann/hmci/ManagedSystem.groovy index 45228dd..e327117 100644 --- a/src/main/groovy/biz/nellemann/hmci/ManagedSystem.groovy +++ b/src/main/groovy/biz/nellemann/hmci/ManagedSystem.groovy @@ -1,3 +1,18 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci import groovy.util.logging.Slf4j @@ -170,7 +185,7 @@ class ManagedSystem extends MetaSystem { } return list - } + } diff --git a/src/main/groovy/biz/nellemann/hmci/MetaSystem.groovy b/src/main/groovy/biz/nellemann/hmci/MetaSystem.groovy index 26ae197..065a780 100644 --- a/src/main/groovy/biz/nellemann/hmci/MetaSystem.groovy +++ b/src/main/groovy/biz/nellemann/hmci/MetaSystem.groovy @@ -1,6 +1,21 @@ +/** + * Copyright 2020 Mark Nellemann + * + * Licensed 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 biz.nellemann.hmci -import biz.nellemann.hmci.pojo.PcmData +import biz.nellemann.hmci.pcm.PcmData import groovy.json.JsonSlurper import groovy.util.logging.Slf4j diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/FiberChannelAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/FiberChannelAdapter.groovy similarity index 91% rename from src/main/groovy/biz/nellemann/hmci/pojo/FiberChannelAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/FiberChannelAdapter.groovy index bafe7e7..f8612f8 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/FiberChannelAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/FiberChannelAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/GenericAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/GenericAdapter.groovy similarity index 91% rename from src/main/groovy/biz/nellemann/hmci/pojo/GenericAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/GenericAdapter.groovy index df38d49..d8a34d1 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/GenericAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/GenericAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/GenericPhysicalAdapters.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.groovy similarity index 90% rename from src/main/groovy/biz/nellemann/hmci/pojo/GenericPhysicalAdapters.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.groovy index dd0dd92..9fc2539 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/GenericPhysicalAdapters.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/GenericVirtualAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/GenericVirtualAdapter.groovy similarity index 90% rename from src/main/groovy/biz/nellemann/hmci/pojo/GenericVirtualAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/GenericVirtualAdapter.groovy index c53d6a4..47ab712 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/GenericVirtualAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/GenericVirtualAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/LparMemory.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/LparMemory.groovy similarity index 81% rename from src/main/groovy/biz/nellemann/hmci/pojo/LparMemory.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/LparMemory.groovy index a1ca150..4865447 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/LparMemory.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/LparMemory.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/LparProcessor.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/LparProcessor.groovy similarity index 94% rename from src/main/groovy/biz/nellemann/hmci/pojo/LparProcessor.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/LparProcessor.groovy index 68d8da4..50f773b 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/LparProcessor.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/LparProcessor.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/LparUtil.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/LparUtil.groovy similarity index 89% rename from src/main/groovy/biz/nellemann/hmci/pojo/LparUtil.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/LparUtil.groovy index b4b0a41..73ed269 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/LparUtil.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/LparUtil.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/Network.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/Network.groovy similarity index 86% rename from src/main/groovy/biz/nellemann/hmci/pojo/Network.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/Network.groovy index 008f698..3913083 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/Network.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/Network.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/PcmData.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/PcmData.groovy similarity index 73% rename from src/main/groovy/biz/nellemann/hmci/pojo/PcmData.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/PcmData.groovy index 503cf70..986c54c 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/PcmData.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/PcmData.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/PhysicalProcessorPool.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/PhysicalProcessorPool.groovy similarity index 89% rename from src/main/groovy/biz/nellemann/hmci/pojo/PhysicalProcessorPool.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/PhysicalProcessorPool.groovy index 9d32610..85d6f48 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/PhysicalProcessorPool.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/PhysicalProcessorPool.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/SampleInfo.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/SampleInfo.groovy similarity index 77% rename from src/main/groovy/biz/nellemann/hmci/pojo/SampleInfo.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/SampleInfo.groovy index ac63892..10bb780 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/SampleInfo.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/SampleInfo.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/ServerMemory.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/ServerMemory.groovy similarity index 86% rename from src/main/groovy/biz/nellemann/hmci/pojo/ServerMemory.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/ServerMemory.groovy index 6df3cc2..a293af4 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/ServerMemory.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/ServerMemory.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/ServerProcessor.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/ServerProcessor.groovy similarity index 87% rename from src/main/groovy/biz/nellemann/hmci/pojo/ServerProcessor.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/ServerProcessor.groovy index 4b22a8d..b03a367 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/ServerProcessor.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/ServerProcessor.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/ServerUtil.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/ServerUtil.groovy similarity index 87% rename from src/main/groovy/biz/nellemann/hmci/pojo/ServerUtil.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/ServerUtil.groovy index 6c4f29a..9f184a1 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/ServerUtil.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/ServerUtil.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/SharedAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/SharedAdapter.groovy similarity index 92% rename from src/main/groovy/biz/nellemann/hmci/pojo/SharedAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/SharedAdapter.groovy index ce99838..0b9ab69 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/SharedAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/SharedAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/SharedProcessorPool.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/SharedProcessorPool.groovy similarity index 90% rename from src/main/groovy/biz/nellemann/hmci/pojo/SharedProcessorPool.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/SharedProcessorPool.groovy index fe90322..2a0d5e9 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/SharedProcessorPool.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/SharedProcessorPool.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/Storage.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/Storage.groovy similarity index 90% rename from src/main/groovy/biz/nellemann/hmci/pojo/Storage.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/Storage.groovy index be9832a..150152a 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/Storage.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/Storage.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/SystemUtil.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/SystemUtil.groovy similarity index 79% rename from src/main/groovy/biz/nellemann/hmci/pojo/SystemUtil.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/SystemUtil.groovy index 34f2853..707b706 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/SystemUtil.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/SystemUtil.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/UtilInfo.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/UtilInfo.groovy similarity index 81% rename from src/main/groovy/biz/nellemann/hmci/pojo/UtilInfo.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/UtilInfo.groovy index 8dd556a..c30d1cf 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/UtilInfo.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/UtilInfo.groovy @@ -1,9 +1,7 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString -import java.time.Instant - @ToString class UtilInfo { diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/UtilSample.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/UtilSample.groovy similarity index 86% rename from src/main/groovy/biz/nellemann/hmci/pojo/UtilSample.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/UtilSample.groovy index 9e6b745..b595aad 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/UtilSample.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/UtilSample.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/ViosUtil.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/ViosUtil.groovy similarity index 91% rename from src/main/groovy/biz/nellemann/hmci/pojo/ViosUtil.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/ViosUtil.groovy index 871dbb1..2873d6e 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/ViosUtil.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/ViosUtil.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/VirtualEthernetAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.groovy similarity index 95% rename from src/main/groovy/biz/nellemann/hmci/pojo/VirtualEthernetAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.groovy index 6c88e35..4930a73 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/VirtualEthernetAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/main/groovy/biz/nellemann/hmci/pojo/VirtualFiberChannelAdapter.groovy b/src/main/groovy/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.groovy similarity index 92% rename from src/main/groovy/biz/nellemann/hmci/pojo/VirtualFiberChannelAdapter.groovy rename to src/main/groovy/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.groovy index abe332c..380c251 100644 --- a/src/main/groovy/biz/nellemann/hmci/pojo/VirtualFiberChannelAdapter.groovy +++ b/src/main/groovy/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.groovy @@ -1,4 +1,4 @@ -package biz.nellemann.hmci.pojo +package biz.nellemann.hmci.pcm import groovy.transform.ToString diff --git a/src/test/groovy/biz/nellemann/hmci/ManagedSystemTest.groovy b/src/test/groovy/biz/nellemann/hmci/ManagedSystemTest.groovy index 9ef7165..115b78f 100644 --- a/src/test/groovy/biz/nellemann/hmci/ManagedSystemTest.groovy +++ b/src/test/groovy/biz/nellemann/hmci/ManagedSystemTest.groovy @@ -72,4 +72,19 @@ class ManagedSystemTest extends Specification { listOfMaps.first().get("fields")['assignedProcUnits'] == 23.767 } + void "test VIOS data"() { + setup: + def testFile = new File(getClass().getResource('/pcm-data-managed-system.json').toURI()) + def testJson = testFile.getText('UTF-8') + ManagedSystem system = new ManagedSystem("site1", "e09834d1-c930-3883-bdad-405d8e26e166", "Test Name","Test Type", "Test Model", "Test S/N") + + when: + system.processMetrics(testJson) + List listOfMaps = system.getSharedProcessorPools() + + then: + listOfMaps.size() == 1 + listOfMaps.first().get("fields")['assignedProcUnits'] == 23.767 + } + } diff --git a/src/test/groovy/biz/nellemann/hmci/MetaSystemTest.groovy b/src/test/groovy/biz/nellemann/hmci/MetaSystemTest.groovy index 4a66ac9..e53e79e 100644 --- a/src/test/groovy/biz/nellemann/hmci/MetaSystemTest.groovy +++ b/src/test/groovy/biz/nellemann/hmci/MetaSystemTest.groovy @@ -20,4 +20,5 @@ class MetaSystemTest extends Specification { then: instant.getEpochSecond() == 1597086630 } + }