From 3a3123747f629f9202c567f4c2bee397f95d550b Mon Sep 17 00:00:00 2001 From: abr-ubiqube Date: Thu, 22 Sep 2022 10:24:40 +0000 Subject: [PATCH 1/8] Openstack MS update --- OPENSTACK/Keystone_v3/glance/.meta_images.xml | 8 +- OPENSTACK/Keystone_v3/glance/images.xml | 149 ++--- .../Keystone_v3/keystone/.meta_tenants.xml | 8 +- OPENSTACK/Keystone_v3/keystone/tenants.xml | 112 ++-- .../neutron/.meta_security_group_rules.xml | 8 +- .../neutron/.meta_security_groups.xml | 8 +- .../neutron/security_group_rules.xml | 129 +++-- .../Keystone_v3/neutron/security_groups.xml | 133 +++-- .../nova/.meta_availability_zones.xml | 8 +- OPENSTACK/Keystone_v3/nova/.meta_flavors.xml | 8 +- OPENSTACK/Keystone_v3/nova/.meta_servers.xml | 4 +- .../Keystone_v3/nova/availability_zones.xml | 45 +- OPENSTACK/Keystone_v3/nova/flavors.xml | 106 ++-- OPENSTACK/Keystone_v3/nova/servers.xml | 530 +++++++++++++++--- 14 files changed, 860 insertions(+), 396 deletions(-) mode change 100644 => 100755 OPENSTACK/Keystone_v3/nova/.meta_flavors.xml diff --git a/OPENSTACK/Keystone_v3/glance/.meta_images.xml b/OPENSTACK/Keystone_v3/glance/.meta_images.xml index 514987ee..47e5cee0 100755 --- a/OPENSTACK/Keystone_v3/glance/.meta_images.xml +++ b/OPENSTACK/Keystone_v3/glance/.meta_images.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + images.xml + DATE_MODIFICATION - 1588580837802 + 1663835715505 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580837797 + 1663835715478 MODEL diff --git a/OPENSTACK/Keystone_v3/glance/images.xml b/OPENSTACK/Keystone_v3/glance/images.xml index 34c44257..fdeeac8f 100644 --- a/OPENSTACK/Keystone_v3/glance/images.xml +++ b/OPENSTACK/Keystone_v3/glance/images.xml @@ -1,126 +1,135 @@ - - + + + /images/repository/CommandDefinition/icons/file server.jpg + + name + + 10000 + 5 xml false - - name false - Glance - /images/repository/CommandDefinition/icons/file server.jpg false + 0 + + Images + Glance false 1 - Images - 10000 - false - false true true true params._order - 5 - - - - - + + + + + + - vdi - raw - aki - ari - qcow2 - ami - iso - vmdk - vhd + vdi + raw + aki + ari + qcow2 + ami + iso + vmdk + vhd - + - bare - aki - ari - ovf - ami + bare + aki + ari + ovf + ami - - - - - + + + + + - public - private + public + private - - + + + - glance - /v2/images +
+ @^\s \s*$@ //root/images/row
- id + @<id>(?<object_id>.*)</id>@ + id - name + @<name>(?<name>.*)</name>@ + name - status + @<status>(?<status>.*)</status>@ + status - container_format + @<container_format>(?<container_format>.*)</container_format>@ + container_format - disk_format + @<disk_format>(?<disk_format>.*)</disk_format>@ + disk_format - min_disk + @<min_disk>(?<min_disk>.*)</min_disk>@ + min_disk - min_ram + @<min_ram>(?<min_ram>.*)</min_ram>@ + min_ram - protected + @<protected>(?<protected>.*)</protected>@ + protected - visibility + @<visibility>(?<visibility>.*)</visibility>@ + visibility - size + @<size>(?<size>.*)</size>@ + size - + /v2/images - - POST#glance - - /v2/images - - {literal}{{/literal} + + +]]> + POST#glance + + /v2/images + - + + glance - ​/v2/images/{$params.object_id|object_id} + ​/v2/images/{$params.object_id|object_id} - - - + + PUT#glance - ​/v2/images/{$params.object_id|object_id}/file + ​/v2/images/{$params.object_id|object_id}/file - @{$params.file_path} - diff --git a/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml b/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml index 8d42701c..67b2bccd 100755 --- a/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml +++ b/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + tenants.xml + DATE_MODIFICATION - 1588580712473 + 1663730045432 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580712467 + 1663730045397 MODEL diff --git a/OPENSTACK/Keystone_v3/keystone/tenants.xml b/OPENSTACK/Keystone_v3/keystone/tenants.xml index b9e7b2bb..536e1d1a 100644 --- a/OPENSTACK/Keystone_v3/keystone/tenants.xml +++ b/OPENSTACK/Keystone_v3/keystone/tenants.xml @@ -1,63 +1,62 @@ - - + + + /images/repository/CommandDefinition/icons/androgenous person.jpg + + name + + 1 + 5 xml false - - name false - Keystone - /images/repository/CommandDefinition/icons/androgenous person.jpg false - false - 0 0 - Tenants - 1 + Tenants + Keystone + false + 0 false true true true params._order - 5 - - - - - - + + + + + + + roles - + users - + domains - - + + tenants - + + Click here and paste your configuration example that represent the object OR a complete existant Object definition file. - - POST#keystone - - /projects - - {literal}{{/literal} + + +]]> + POST#keystone + + /projects + - keystone - /projects +
+ @^\s \s*$@ //root/projects/row
- id + @<id>(?<object_id>.*)</id>@ + id - domain_id + @<domain_id>(?<domain_id>.*)</domain_id>@ + domain_id - is_domain + @<is_domain>(?<is_domain>.*)</is_domain>@ + is_domain - parent_id + @<parent_id>(?<parent_id>.*)</parent_id>@ + parent_id - description + @<description>(?<description>.*)</description>@ + description - enabled + @<enabled>(?<enabled>.*)</enabled>@ + enabled - name + @<name>(?<name>.*)</name>@ + name - + /projects - - PATCH#keystone - - ​/projects/{$params.object_id|object_id} - - {literal}{{/literal} + + +]]> + PATCH#keystone + + ​/projects/{$params.object_id|object_id} + - + + keystone - ​/projects/{$params.object_id|object_id} + ​/projects/{$params.object_id|object_id} - - - \ No newline at end of file + diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml b/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml index 70a52b04..84ef3e4d 100755 --- a/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + security_group_rules.xml + DATE_MODIFICATION - 1588580898090 + 1663754458543 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580898075 + 1663754458514 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml b/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml index d2ae3a6f..7f697b04 100755 --- a/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + security_groups.xml + DATE_MODIFICATION - 1588580808584 + 1663753108737 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580808577 + 1663753108707 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml b/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml index 8a40ab9d..54bf7379 100644 --- a/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml +++ b/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml @@ -1,132 +1,134 @@ - - + + + /images/repository/CommandDefinition/icons/firewall.jpg + + object_id + + 10000 + 5 xml false - - object_id false - Neutron|Security Groups - /images/repository/CommandDefinition/icons/firewall.jpg false + 0 + + Security Group Rules + Neutron|Security Groups false 2 - Security Group Rules - 10000 - false - false true true true params._order - 5 - - - + + + + security_groups - + - ingress - egress + ingress + egress - + - udp - null - icmp - tcp + udp + null + icmp + tcp - + - IPv6 - IPv4 + IPv6 + IPv4 - - - + + + security_groups - - - - tenants - - - + + + + - - neutron - /v2.0/security-group-rules + +
+ @^\s \s*$@ //root/security_group_rules/row
- id + @<id>(?<object_id>.*)</id>@ + id - security_group_id + @<security_group_id>(?<security_group_id>.*)</security_group_id>@ + security_group_id - direction + @<direction>(?<direction>.*)</direction>@ + direction - ethertype + @<ethertype>(?<ethertype>.*)</ethertype>@ + ethertype - port_range_min + @<port_range_min>(?<port_range_min>.*)</port_range_min>@ + port_range_min - port_range_max + @<port_range_max>(?<port_range_max>.*)</port_range_max>@ + port_range_max - protocol + @<protocol>(?<protocol>.*)</protocol>@ + protocol - remote_ip_prefix + @<remote_ip_prefix>(?<remote_ip_prefix>.*)</remote_ip_prefix>@ + remote_ip_prefix - remote_group_id + @<remote_group_id>(?<remote_group_id>.*)</remote_group_id>@ + remote_group_id - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - - - - + /v2.0/security-group-rules - POST#neutron - - /v2.0/security-group-rules - - {literal}{{/literal} + +]]> + POST#neutron + + /v2.0/security-group-rules + + neutron - /​v2.0/security-group-rules/{$params.object_id|object_id} + /​v2.0/security-group-rules/{$params.object_id|object_id} - - + diff --git a/OPENSTACK/Keystone_v3/neutron/security_groups.xml b/OPENSTACK/Keystone_v3/neutron/security_groups.xml index 228c252c..494dba97 100644 --- a/OPENSTACK/Keystone_v3/neutron/security_groups.xml +++ b/OPENSTACK/Keystone_v3/neutron/security_groups.xml @@ -1,126 +1,132 @@ - - + + + /images/repository/CommandDefinition/icons/firewall.jpg + + name + + 10000 + 5 xml false - - name false - Neutron|Security Groups - /images/repository/CommandDefinition/icons/firewall.jpg false + 0 + + Security Groups + Neutron|Security Groups false 1 - Security Groups - 10000 - false - false true true true params._order - 5 - - - - - + + + + + + -
Security Group Rules
+ Security Group Rules - + -
Security Group Rules
+ Security Group Rules - + -
Security Group Rules
+ Security Group Rules - + -
Security Group Rules
+ Security Group Rules - + -
Security Group Rules
+ Security Group Rules - - - tenants - - - + + + - - neutron - /v2.0/security-groups + +
+ @^\s \s*$@ //root/security_groups/row
- id + @<id>(?<object_id>.*)</id>@ + id - name + @<name>(?<name>.*)</name>@ + name - description + @<description>(?<description>.*)</description>@ + description - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - security_group_rules/row - direction + @<direction>(?<direction>.*)</direction>@ + direction - ethertype + @<ethertype>(?<ethertype>.*)</ethertype>@ + ethertype - port_range_min + @<port_range_min>(?<port_range_min>.*)</port_range_min>@ + port_range_min - port_range_max + @<port_range_max>(?<port_range_max>.*)</port_range_max>@ + port_range_max - protocol + @<protocol>(?<protocol>.*)</protocol>@ + protocol + security_group_rules/row + + - + /v2.0/security-groups - - POST#neutron - - /v2.0/security-groups - - {literal}{{/literal} + + +]]> + POST#neutron + + /v2.0/security-groups + + neutron /v2.0/security-groups/{$params.object_id|object_id} - - - - PUT#neutron - - /v2.0/security-groups/{$params.object_id|object_id} - - {literal}{{/literal} + + +]]> + PUT#neutron + + /v2.0/security-groups/{$params.object_id|object_id} + + diff --git a/OPENSTACK/Keystone_v3/nova/.meta_availability_zones.xml b/OPENSTACK/Keystone_v3/nova/.meta_availability_zones.xml index b70ee378..4417c183 100755 --- a/OPENSTACK/Keystone_v3/nova/.meta_availability_zones.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_availability_zones.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + availability_zones.xml + DATE_MODIFICATION - 1588580885929 + 1663672482199 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580885922 + 1663672482143 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml b/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml old mode 100644 new mode 100755 index 3f98face..696397a5 --- a/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + flavors.xml + DATE_MODIFICATION - 1588582707021 + 1663764226149 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1663764226125 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/.meta_servers.xml b/OPENSTACK/Keystone_v3/nova/.meta_servers.xml index 415d4640..645d2e2d 100755 --- a/OPENSTACK/Keystone_v3/nova/.meta_servers.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_servers.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1643096004400 + 1663836366669 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1643096004394 + 1663836366636 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/availability_zones.xml b/OPENSTACK/Keystone_v3/nova/availability_zones.xml index f25cfce9..79c1dd6b 100644 --- a/OPENSTACK/Keystone_v3/nova/availability_zones.xml +++ b/OPENSTACK/Keystone_v3/nova/availability_zones.xml @@ -1,52 +1,57 @@ - - + + + /images/eclipseIcons/page_obj.gif + + object_id + + 10000 + 5 xml false - - object_id false - Nova - /images/eclipseIcons/page_obj.gif false + 0 + + Availability Zones + Nova false 1 - Availability Zones - 10000 - false - false true true true params._order - 5 - - - - + + + + + + - nova - {$TENANT_ID}/os-availability-zone/detail +
+ @^\s \s*$@ //root/availabilityZoneInfo/row
- zoneName + @<zoneName>(?<object_id>.*)</zoneName>@ + zoneName - zoneState/available + @<available>(?<zone_state>.*)</available>@ + zoneState/available - + /{$TENANT_ID}/os-availability-zone/detail diff --git a/OPENSTACK/Keystone_v3/nova/flavors.xml b/OPENSTACK/Keystone_v3/nova/flavors.xml index ab7e06d9..08fa0294 100644 --- a/OPENSTACK/Keystone_v3/nova/flavors.xml +++ b/OPENSTACK/Keystone_v3/nova/flavors.xml @@ -1,109 +1,110 @@ - - + + + /images/repository/CommandDefinition/icons/www server.jpg + + name + + 10000 + 5 xml false - - name false - Nova - /images/repository/CommandDefinition/icons/www server.jpg false - false - 2 0 - Flavors - 10000 + Flavors + Nova + false + 2 false true true true params._order - 5 - - - - - - - - - - - + + + + + + + + + + + + - nova - /{$TENANT_ID}/flavors/detail +
+ @^\s \s*$@ //root/flavors/row
- - id + @<id>(?<object_id>.*)</id>@ + id - name + @<name>(?<name>.*)</name>@ + name - ram + @<ram>(?<memory_mb>.*)</ram>@ + ram - disk + @<disk>(?<disk>.*)</disk>@ + disk - ephemeral + @<ephemeral>(?<ephemeral>.*)</ephemeral>@ + ephemeral - swap + @<swap>(?<swap>.*)</swap>@ + swap - vcpus + @<vcpus>(?<vcpus>.*)</vcpus>@ + vcpus - rxtx_factor + @<rxtx_factor>(?<rxtx_factor>.*)</rxtx_factor>@ + rxtx_factor - is_public + @<is_public>(?<is_public>.*)</is_public>@ + is_public - - - - + /{$TENANT_ID}/flavors/detail - - POST#nova - - /{$TENANT_ID}/flavors - - {literal}{{/literal} + + +]]> + POST#nova + + /{$TENANT_ID}/flavors + + nova /{$TENANT_ID}/flavors/{$params.object_id|object_id} - - + diff --git a/OPENSTACK/Keystone_v3/nova/servers.xml b/OPENSTACK/Keystone_v3/nova/servers.xml index c9b70e35..1c500e32 100755 --- a/OPENSTACK/Keystone_v3/nova/servers.xml +++ b/OPENSTACK/Keystone_v3/nova/servers.xml @@ -25,11 +25,16 @@ params._order - - - - - + + + + + images + + + + + 0 1 @@ -40,12 +45,12 @@ 9 - + Addresses - + Addresses @@ -54,17 +59,17 @@ 4 - + Addresses - + Addresses - + Networks @@ -72,7 +77,7 @@ networks - + Networks @@ -80,12 +85,12 @@ ports - + Networks - + Security Groups @@ -93,72 +98,63 @@ security_groups - - - - - - - - images - - - + + + + + + flavors - + keypairs - - - tenants - - - + + availability_zones - - - - - + + + + + Personality - + Personality - + Metadata - + Metadata - + false true - + Block Device Mapping V2 - + Block Device Mapping V2 @@ -169,7 +165,7 @@ volume - + Block Device Mapping V2 @@ -178,7 +174,7 @@ volume - + Block Device Mapping V2 @@ -187,7 +183,7 @@ false - + Block Device Mapping V2 @@ -196,7 +192,7 @@ swap - + Block Device Mapping V2 @@ -205,32 +201,33 @@ -1 - + Links - + Links - + - + Server Action Server Update - + + false Add Floating IP Address Remove Floating IP Address @@ -260,6 +257,24 @@ Evacuate Server Reboot + + + + + + + + false + 0 + false + false + false + false + + + false + + false @@ -292,69 +307,441 @@ Revert Resize - + + false - networks + networks + + + + + + + + false + 0 + false + false + false + false + + + false + + false + false - floatingips + floatingips + + + + + + + + false + 0 + false + false + false + false + + + false + + false + false - security_groups + security_groups + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false - - - + false SOFT HARD + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false - + false - floatingips + floatingips + + + + + + + + false + 0 + false + false + false + false + + + false + + false + false - security_groups + security_groups + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false - + false - flavors + flavors + + + + + + + + false + 0 + false + false + false + false + + + false + + false - + - + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + false daily weekly + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false - - - + - - - + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + + + false + + + + + + + + false + 0 + false + false + false + false + + + false + + false + @@ -842,4 +1229,5 @@ POST#nova /{$TENANT_ID}/servers/{$params.object_id|object_id}/action {/if} + From 60820f31d3cfb079bd7c21ee5b013084203d1367 Mon Sep 17 00:00:00 2001 From: abr-ubiqube Date: Mon, 7 Nov 2022 13:22:15 +0000 Subject: [PATCH 2/8] update license MS to handle text version of the certificate --- LINUX/MSA_LICENSE/.meta_License.xml | 4 ++-- LINUX/MSA_LICENSE/License.xml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/LINUX/MSA_LICENSE/.meta_License.xml b/LINUX/MSA_LICENSE/.meta_License.xml index 73f55b74..5001d27f 100755 --- a/LINUX/MSA_LICENSE/.meta_License.xml +++ b/LINUX/MSA_LICENSE/.meta_License.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1662724718294 + 1666008295948 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1662724718277 + 1666008295923 MODEL diff --git a/LINUX/MSA_LICENSE/License.xml b/LINUX/MSA_LICENSE/License.xml index 0f4b963c..98184448 100644 --- a/LINUX/MSA_LICENSE/License.xml +++ b/LINUX/MSA_LICENSE/License.xml @@ -37,10 +37,10 @@ - SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; for f in /opt/fmc_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/*.txt; do echo `basename "$f"` >> /opt/fmc_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; cat $f >> /opt/fmc_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; done; sed -i '/^$/d' /opt/fmc_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt ; cat /opt/fmc_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt]]> + SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; for f in /mnt/NASVolume/msa_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/*.lic; do echo `basename "$f"` >> /mnt/NASVolume/msa_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; cat $f >> /mnt/NASVolume/msa_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt; done; sed -i '/^$/d' /mnt/NASVolume/msa_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt ; cat /mnt/NASVolume/msa_repository/Datafiles/{$SD->SD_CLI_PREFIX}/{$SD->SD_ABONNE}/appended_lic.txt]]>
- @(?<object_id>\d+)\.txt@ + @(?<object_id>\d+)\.txt\.lic@
@@ -131,6 +131,8 @@ - + + + From 85b56fa0fd117d59a056f80fc3a5646da5badff2 Mon Sep 17 00:00:00 2001 From: abr-ubiqube Date: Mon, 7 Nov 2022 13:23:05 +0000 Subject: [PATCH 3/8] update for prod setup --- ASSURANCE/GENERIC/.meta_snmpv3.xml | 4 ++-- ASSURANCE/GENERIC/snmpv3.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ASSURANCE/GENERIC/.meta_snmpv3.xml b/ASSURANCE/GENERIC/.meta_snmpv3.xml index a9d5f5ea..03fc9d60 100755 --- a/ASSURANCE/GENERIC/.meta_snmpv3.xml +++ b/ASSURANCE/GENERIC/.meta_snmpv3.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1660727301571 + 1665562950199 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1660727301558 + 1665562950160 MODEL diff --git a/ASSURANCE/GENERIC/snmpv3.xml b/ASSURANCE/GENERIC/snmpv3.xml index f3caeae0..02c894fd 100644 --- a/ASSURANCE/GENERIC/snmpv3.xml +++ b/ASSURANCE/GENERIC/snmpv3.xml @@ -25,16 +25,16 @@ params._order - - + + authPriv noAuthNoPriv authNoPriv - - + + MD5 SHA1 @@ -44,15 +44,15 @@ SHA512 - - + + DES AES - - + + From 1bf0b8e1601e8e8975d4c8f7ab93ec5c340c1c70 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Nov 2022 06:27:55 +0000 Subject: [PATCH 4/8] add new K8 MS based on JSON API --- KUBERNETES/Generic/JSON/.meta_Deployments.xml | 43 ++++++ KUBERNETES/Generic/JSON/.meta_Namespaces.xml | 43 ++++++ KUBERNETES/Generic/JSON/.meta_Nodes.xml | 43 ++++++ KUBERNETES/Generic/JSON/.meta_Pods.xml | 43 ++++++ KUBERNETES/Generic/JSON/.meta_Services.xml | 43 ++++++ KUBERNETES/Generic/JSON/Deployments.xml | 78 +++++++++++ KUBERNETES/Generic/JSON/Namespaces.xml | 54 ++++++++ KUBERNETES/Generic/JSON/Nodes.xml | 75 +++++++++++ KUBERNETES/Generic/JSON/Pods.xml | 96 ++++++++++++++ KUBERNETES/Generic/JSON/Services.xml | 123 ++++++++++++++++++ 10 files changed, 641 insertions(+) create mode 100755 KUBERNETES/Generic/JSON/.meta_Deployments.xml create mode 100755 KUBERNETES/Generic/JSON/.meta_Namespaces.xml create mode 100755 KUBERNETES/Generic/JSON/.meta_Nodes.xml create mode 100755 KUBERNETES/Generic/JSON/.meta_Pods.xml create mode 100755 KUBERNETES/Generic/JSON/.meta_Services.xml create mode 100644 KUBERNETES/Generic/JSON/Deployments.xml create mode 100644 KUBERNETES/Generic/JSON/Namespaces.xml create mode 100644 KUBERNETES/Generic/JSON/Nodes.xml create mode 100644 KUBERNETES/Generic/JSON/Pods.xml create mode 100644 KUBERNETES/Generic/JSON/Services.xml diff --git a/KUBERNETES/Generic/JSON/.meta_Deployments.xml b/KUBERNETES/Generic/JSON/.meta_Deployments.xml new file mode 100755 index 00000000..819452fb --- /dev/null +++ b/KUBERNETES/Generic/JSON/.meta_Deployments.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + Deployments.xml + + + DATE_MODIFICATION + 1669175785117 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669175785097 + + + MODEL + 20060101 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 20060101 + + + TYPE + FILE + + + COMMENT + + + diff --git a/KUBERNETES/Generic/JSON/.meta_Namespaces.xml b/KUBERNETES/Generic/JSON/.meta_Namespaces.xml new file mode 100755 index 00000000..e6982776 --- /dev/null +++ b/KUBERNETES/Generic/JSON/.meta_Namespaces.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + Namespaces.xml + + + DATE_MODIFICATION + 1669178317617 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669178317596 + + + MODEL + 20060101 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 20060101 + + + TYPE + FILE + + + COMMENT + + + diff --git a/KUBERNETES/Generic/JSON/.meta_Nodes.xml b/KUBERNETES/Generic/JSON/.meta_Nodes.xml new file mode 100755 index 00000000..50b6a78c --- /dev/null +++ b/KUBERNETES/Generic/JSON/.meta_Nodes.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + Nodes.xml + + + DATE_MODIFICATION + 1669183890902 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669183890883 + + + MODEL + 20060101 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 20060101 + + + TYPE + FILE + + + COMMENT + + + diff --git a/KUBERNETES/Generic/JSON/.meta_Pods.xml b/KUBERNETES/Generic/JSON/.meta_Pods.xml new file mode 100755 index 00000000..5a2c624b --- /dev/null +++ b/KUBERNETES/Generic/JSON/.meta_Pods.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + Pods.xml + + + DATE_MODIFICATION + 1669181175167 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669181175147 + + + MODEL + 20060101 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 20060101 + + + TYPE + FILE + + + COMMENT + + + diff --git a/KUBERNETES/Generic/JSON/.meta_Services.xml b/KUBERNETES/Generic/JSON/.meta_Services.xml new file mode 100755 index 00000000..3ae531cb --- /dev/null +++ b/KUBERNETES/Generic/JSON/.meta_Services.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + Services.xml + + + DATE_MODIFICATION + 1669182921200 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669182921176 + + + MODEL + 20060101 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 20060101 + + + TYPE + FILE + + + COMMENT + + + diff --git a/KUBERNETES/Generic/JSON/Deployments.xml b/KUBERNETES/Generic/JSON/Deployments.xml new file mode 100644 index 00000000..04fdf38b --- /dev/null +++ b/KUBERNETES/Generic/JSON/Deployments.xml @@ -0,0 +1,78 @@ + + + none + + object_id + + 0 + 5 + json + + + false + false + false + 0 + + Deployments - JSON + container|k8|JSON + false + 0 + false + false + false + false + params._order + + + + + + + + + + + + +
+ @^\s \s*$@ + $.items[*] +
+ + + + @^(?<object_id>.*)$@ + $..name + + + + @^(?<replicas>.*)$@ + $..status.replicas + + + + @^(?<availableReplicas>.*)$@ + $..status.availableReplicas + + + + @^(?<readyReplicas>.*)$@ + $..status.readyReplicas + + + + @^(?<updatedReplicas>.*)$@ + $..status.updatedReplicas + + + + /apis/apps/v1/deployments + + + + + + + + diff --git a/KUBERNETES/Generic/JSON/Namespaces.xml b/KUBERNETES/Generic/JSON/Namespaces.xml new file mode 100644 index 00000000..e61ae8e1 --- /dev/null +++ b/KUBERNETES/Generic/JSON/Namespaces.xml @@ -0,0 +1,54 @@ + + + none + + object_id + + 0 + 5 + json + + + false + false + false + 0 + + Namespaces - JSON + CONTAINER|K8|JSON + false + 0 + false + false + false + false + params._order + + + + + + + + +
+ @^\s \s*$@ + $.items[*] +
+ + + + @^(?<object_id>.*)$@ + $..metadata.name + + + + /api/v1/namespaces/ + + + + + + + + diff --git a/KUBERNETES/Generic/JSON/Nodes.xml b/KUBERNETES/Generic/JSON/Nodes.xml new file mode 100644 index 00000000..a00be6ff --- /dev/null +++ b/KUBERNETES/Generic/JSON/Nodes.xml @@ -0,0 +1,75 @@ + + + none + + object_id + + 0 + 5 + json + + + false + false + false + 0 + + Nodes - JSON + CONTAINER|k8|json + false + 0 + false + false + false + false + params._order + + + + + + + + + + +
+ @^\s \s*$@ + $.items[*] +
+ + + + @^(?<object_id>.*)$@ + $..name + + + + + + + @^(?<type>.*)$@ + $.type + + + + @^(?<address>.*)$@ + $.address + + + $..addresses[*] + + + + + + + /api/v1/nodes/ + + + + + + + + diff --git a/KUBERNETES/Generic/JSON/Pods.xml b/KUBERNETES/Generic/JSON/Pods.xml new file mode 100644 index 00000000..f7c9bd09 --- /dev/null +++ b/KUBERNETES/Generic/JSON/Pods.xml @@ -0,0 +1,96 @@ + + + none + + object_id + + 0 + 5 + json + + + false + false + false + 0 + + Pods - JSON + CONTAINER|K8|JSON + false + 0 + false + false + false + false + params._order + + + + + + + + + + + + + + + +
+ @^\s \s*$@ + $.items[*] +
+ + + + @^(?<object_id>.*)$@ + $..metadata.name + + + + @^(?<creationTimestamp>.*)$@ + $..metadata.creationTimestamp + + + + @^(?<app_name>.*)$@ + $..metadata.labels.app + + + + @^(?<container_name>.*)$@ + $..containers[*].name + + + + @^(?<container_image>.*)$@ + $..containers[*].image + + + + @^(?<container_status_phase>.*)$@ + $..status.phase + + + + @^(?<namespace>.*)$@ + $..metadata.namespace + + + + @^(?<nodeName>.*)$@ + $..nodeName + + + + /api/v1/pods + + + + + + + + diff --git a/KUBERNETES/Generic/JSON/Services.xml b/KUBERNETES/Generic/JSON/Services.xml new file mode 100644 index 00000000..6b55604e --- /dev/null +++ b/KUBERNETES/Generic/JSON/Services.xml @@ -0,0 +1,123 @@ + + + none + + object_id + + 0 + 5 + json + + + false + false + false + 0 + + Services - JSON + CONTAINER|K8|JSON + false + 0 + false + false + false + false + params._order + + + + + + + + PORTS + + + + + PORTS + + + + + PORTS + + + + + PORTS + + + + + + + + + + +
+ @^\s \s*$@ + $.items[*] +
+ + + + @(?<object_id>.*)@ + $..metadata.name + + + + @(?<creation_date>.*)@ + $..metadata.creationTimestamp + + + + @(?<cluster_ip>.*)@ + $..spec.clusterIP + + + + @^(?<type>.*)$@ + $..spec.type + + + + + + + @^(?<name>.*)$@ + $.name + + + + @^(?<protocol>.*)$@ + $.protocol + + + + @^(?<port>.*)$@ + $.port + + + + @^(?<targetPort>.*)$@ + $.targetPort + + + $..spec.ports[*] + + + + + + + /api/v1/services + + + + + + + + From 49c933a575b268f88c1a2e5f10cb9bd1ab5443ae Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Nov 2022 06:31:14 +0000 Subject: [PATCH 5/8] updated K8 MS based on XML --- KUBERNETES/Generic/.meta_Namespaces.xml | 8 +- KUBERNETES/Generic/.meta_Nodes.xml | 18 +-- .../Generic/.meta_k8_deployments_list.xml | 18 +-- KUBERNETES/Generic/.meta_k8_pods_list.xml | 8 +- KUBERNETES/Generic/.meta_k8_services_list.xml | 18 +-- KUBERNETES/Generic/Namespaces.xml | 18 +-- KUBERNETES/Generic/Nodes.xml | 8 +- KUBERNETES/Generic/k8_deployments_list.xml | 71 ++++++------ KUBERNETES/Generic/k8_pods_list.xml | 26 ++--- KUBERNETES/Generic/k8_services_list.xml | 103 +++++++++--------- 10 files changed, 161 insertions(+), 135 deletions(-) mode change 100644 => 100755 KUBERNETES/Generic/.meta_Namespaces.xml mode change 100644 => 100755 KUBERNETES/Generic/.meta_Nodes.xml diff --git a/KUBERNETES/Generic/.meta_Namespaces.xml b/KUBERNETES/Generic/.meta_Namespaces.xml old mode 100644 new mode 100755 index bc813406..0986015b --- a/KUBERNETES/Generic/.meta_Namespaces.xml +++ b/KUBERNETES/Generic/.meta_Namespaces.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + Namespaces.xml + DATE_MODIFICATION - 1604505611067 + 1669178016967 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1604505611045 + 1669178016943 MODEL diff --git a/KUBERNETES/Generic/.meta_Nodes.xml b/KUBERNETES/Generic/.meta_Nodes.xml old mode 100644 new mode 100755 index c9b675e9..c7a32699 --- a/KUBERNETES/Generic/.meta_Nodes.xml +++ b/KUBERNETES/Generic/.meta_Nodes.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + Nodes.xml + DATE_MODIFICATION - 1605535459377 + 1668694572256 REPOSITORY @@ -11,19 +15,18 @@ DATE_CREATION - 1605535459251 + 1668694572239 - FILE_TYPE - text + MODEL + 20060101 TAG - string - MODEL - 20060101 + FILE_TYPE + text MANUFACTURER @@ -35,7 +38,6 @@ COMMENT - string diff --git a/KUBERNETES/Generic/.meta_k8_deployments_list.xml b/KUBERNETES/Generic/.meta_k8_deployments_list.xml index 00b83a20..7c4a983b 100755 --- a/KUBERNETES/Generic/.meta_k8_deployments_list.xml +++ b/KUBERNETES/Generic/.meta_k8_deployments_list.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + k8_deployments_list.xml + DATE_MODIFICATION - 1594211978387 + 1668694557346 REPOSITORY @@ -11,19 +15,18 @@ DATE_CREATION - 1594211978313 + 1668694557329 - FILE_TYPE - text + MODEL + 20060101 TAG - string - MODEL - 20060101 + FILE_TYPE + text MANUFACTURER @@ -35,7 +38,6 @@ COMMENT - string diff --git a/KUBERNETES/Generic/.meta_k8_pods_list.xml b/KUBERNETES/Generic/.meta_k8_pods_list.xml index 8526ce6d..10d177ae 100755 --- a/KUBERNETES/Generic/.meta_k8_pods_list.xml +++ b/KUBERNETES/Generic/.meta_k8_pods_list.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + k8_pods_list.xml + DATE_MODIFICATION - 1605543793138 + 1669175934322 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1605543793131 + 1669175934299 MODEL diff --git a/KUBERNETES/Generic/.meta_k8_services_list.xml b/KUBERNETES/Generic/.meta_k8_services_list.xml index 00b83a20..8ded8134 100755 --- a/KUBERNETES/Generic/.meta_k8_services_list.xml +++ b/KUBERNETES/Generic/.meta_k8_services_list.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + k8_services_list.xml + DATE_MODIFICATION - 1594211978387 + 1668694597274 REPOSITORY @@ -11,19 +15,18 @@ DATE_CREATION - 1594211978313 + 1668694597256 - FILE_TYPE - text + MODEL + 20060101 TAG - string - MODEL - 20060101 + FILE_TYPE + text MANUFACTURER @@ -35,7 +38,6 @@ COMMENT - string diff --git a/KUBERNETES/Generic/Namespaces.xml b/KUBERNETES/Generic/Namespaces.xml index aefb875a..6dbcc7dd 100644 --- a/KUBERNETES/Generic/Namespaces.xml +++ b/KUBERNETES/Generic/Namespaces.xml @@ -14,8 +14,8 @@ false 0 - Namespaces - Default + Namespaces - XML + CONTAINER|K8|XML false 0 false @@ -25,12 +25,12 @@ param._order - - + + - GET +
@^\s \s*$@ @@ -49,14 +49,14 @@ - {literal}{{/literal} -"apiVersion": "v1","kind": "Namespace","metadata": {literal}{{/literal}"name": "{$params.namespace}"{literal}}{/literal} -{literal}}{/literal} + POST# /api/v1/namespaces - {} + DELETE /api/v1/namespaces/{$Namespaces.$object_id.namespace} diff --git a/KUBERNETES/Generic/Nodes.xml b/KUBERNETES/Generic/Nodes.xml index 452329de..0739f200 100644 --- a/KUBERNETES/Generic/Nodes.xml +++ b/KUBERNETES/Generic/Nodes.xml @@ -14,7 +14,7 @@ false 0 - Nodes + Nodes - XML Default false 0 @@ -25,12 +25,12 @@ param._order - - + + - GET +
@^\s \s*$@ diff --git a/KUBERNETES/Generic/k8_deployments_list.xml b/KUBERNETES/Generic/k8_deployments_list.xml index 5c0d3041..9bf5aad0 100755 --- a/KUBERNETES/Generic/k8_deployments_list.xml +++ b/KUBERNETES/Generic/k8_deployments_list.xml @@ -1,85 +1,92 @@ - - + + + /images/eclipseIcons/page_obj.gif + + object_id + + 10000 + 5 xml false - - object_id false - Contrainer|K8 - /images/eclipseIcons/page_obj.gif false - false - 1 0 - Deployments - 10000 + Deployments - XML + Contrainer|K8 + false + 1 false true true true params._order - 5 - - - + + + + -
Replicas
+ Replicas - + -
Replicas
+ Replicas - + -
Replicas
+ Replicas - + -
Replicas
+ Replicas - - + + + - GET - /apis/apps/v1/deployments +
+ @^\s \s*$@ //root/items/row
- metadata/name + @<name>(?<object_id>.*)</name>@ + metadata/name - status/replicas + @<replicas>(?<replicas>.*)</replicas>@ + status/replicas - status/availableReplicas + @<availableReplicas>(?<available_replicas>.*)</availableReplicas>@ + status/availableReplicas - status/readyReplicas + @<readyReplicas>(?<ready_replicas>.*)</readyReplicas>@ + status/readyReplicas - status/updatedReplicas + @<updatedReplicas>(?<updated_replicas>.*)</updatedReplicas>@ + status/updatedReplicas - + /apis/apps/v1/deployments - diff --git a/KUBERNETES/Generic/k8_pods_list.xml b/KUBERNETES/Generic/k8_pods_list.xml index 6c200831..627475f2 100755 --- a/KUBERNETES/Generic/k8_pods_list.xml +++ b/KUBERNETES/Generic/k8_pods_list.xml @@ -14,8 +14,8 @@ false 0 - Pods - Contrainer|K8 + Pods - XML + CONTAINER|K8|XML false 1 false @@ -25,13 +25,13 @@ params._order - - + + Pods - + Pods @@ -45,28 +45,28 @@ php - + Pods - + Pods - + Pods - + - GET +
@^\s \s*$@ @@ -115,13 +115,13 @@ - {literal}{{/literal}"apiVersion":"v1","kind":"Pod","metadata":{literal}{{/literal}"name":"{$params.app_name}","namespace": "{$params.namespace}"{literal}}{/literal},"spec":{literal}{{/literal}"containers":[{literal}{{/literal}"name":"{$params.app_name}","image":"{$params.app_name}"{literal}}{/literal}],"restartPolicy":"Never"{literal}}{/literal} -{literal}}{/literal} + POST# /api/v1/namespaces/{$params.namespace}/pods - {} + DELETE /api/v1/namespaces/{$k8_pods_list.$object_id.namespace}/pods/{$k8_pods_list.$object_id.user_app} diff --git a/KUBERNETES/Generic/k8_services_list.xml b/KUBERNETES/Generic/k8_services_list.xml index 99292a1b..6a1b35f4 100755 --- a/KUBERNETES/Generic/k8_services_list.xml +++ b/KUBERNETES/Generic/k8_services_list.xml @@ -1,126 +1,131 @@ - - + + + /images/eclipseIcons/page_obj.gif + + object_id + + 10000 + 5 xml false - - object_id false - Contrainer|K8 - /images/eclipseIcons/page_obj.gif false - false - 1 0 - Services - 10000 + Services - XML + Contrainer|K8 + false + 1 false true true true params._order - 5 - - - + + + + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + -
Service
+ Service - + + - GET - /api/v1/services +
+ @^\s \s*$@ //root/items/row
- metadata/name + @<name>(?<object_id>.*)</name>@ + metadata/name - metadata/creationTimestamp + @<creationTimestamp>(?<creation_date>.*)</creationTimestamp>@ + metadata/creationTimestamp - spec/type + @<type>(?<type>.*)</type>@ + spec/type - spec/clusterIP + @<clusterIP>(?<cluster_ip>.*)</clusterIP>@ + spec/clusterIP - spec/externalIPs/row + @<row>(?<external_ips>.*)</row>@ + spec/externalIPs/row - spec/ports/row/protocol + @<protocol>(?<protocol>.*)</protocol>@ + spec/ports/row/protocol - spec/ports/row/port + @<port>(?<port>.*)</port>@ + spec/ports/row/port - spec/ports/row/targetPort + @<targetPort>(?<target_port>.*)</targetPort>@ + spec/ports/row/targetPort - spec/ports/row/nodePort + @<nodePort>(?<node_port>.*)</nodePort>@ + spec/ports/row/nodePort - - - - - - - + /api/v1/services - From 5e880b16cf27c3e9688b1c029e68d6e73922ac1f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Nov 2022 22:32:47 +0800 Subject: [PATCH 6/8] add MS dor DC/swarm statuys --- LINUX/SYSTEM/.meta_datacenter_status.xml | 43 ++++++++++++++++ LINUX/SYSTEM/.meta_swarm_nodes.xml | 43 ++++++++++++++++ LINUX/SYSTEM/.meta_swarm_service_nodes.xml | 43 ++++++++++++++++ LINUX/SYSTEM/datacenter_status.xml | 52 ++++++++++++++++++++ LINUX/SYSTEM/swarm_nodes.xml | 51 +++++++++++++++++++ LINUX/SYSTEM/swarm_service_nodes.xml | 57 ++++++++++++++++++++++ 6 files changed, 289 insertions(+) create mode 100755 LINUX/SYSTEM/.meta_datacenter_status.xml create mode 100755 LINUX/SYSTEM/.meta_swarm_nodes.xml create mode 100755 LINUX/SYSTEM/.meta_swarm_service_nodes.xml create mode 100644 LINUX/SYSTEM/datacenter_status.xml create mode 100644 LINUX/SYSTEM/swarm_nodes.xml create mode 100644 LINUX/SYSTEM/swarm_service_nodes.xml diff --git a/LINUX/SYSTEM/.meta_datacenter_status.xml b/LINUX/SYSTEM/.meta_datacenter_status.xml new file mode 100755 index 00000000..f6fc1710 --- /dev/null +++ b/LINUX/SYSTEM/.meta_datacenter_status.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + datacenter_status.xml + + + DATE_MODIFICATION + 1669711539219 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669711539199 + + + MODEL + 14020601 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 14020601 + + + TYPE + FILE + + + COMMENT + + + diff --git a/LINUX/SYSTEM/.meta_swarm_nodes.xml b/LINUX/SYSTEM/.meta_swarm_nodes.xml new file mode 100755 index 00000000..e7c6be1a --- /dev/null +++ b/LINUX/SYSTEM/.meta_swarm_nodes.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + swarm_nodes.xml + + + DATE_MODIFICATION + 1669715458966 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669715458951 + + + MODEL + 14020601 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 14020601 + + + TYPE + FILE + + + COMMENT + + + diff --git a/LINUX/SYSTEM/.meta_swarm_service_nodes.xml b/LINUX/SYSTEM/.meta_swarm_service_nodes.xml new file mode 100755 index 00000000..62a6e334 --- /dev/null +++ b/LINUX/SYSTEM/.meta_swarm_service_nodes.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + swarm_service_nodes.xml + + + DATE_MODIFICATION + 1669712756303 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1669712756284 + + + MODEL + 14020601 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 14020601 + + + TYPE + FILE + + + COMMENT + + + diff --git a/LINUX/SYSTEM/datacenter_status.xml b/LINUX/SYSTEM/datacenter_status.xml new file mode 100644 index 00000000..e7e0c9f4 --- /dev/null +++ b/LINUX/SYSTEM/datacenter_status.xml @@ -0,0 +1,52 @@ + + + none + + object_id + + 0 + 5 + cli + + + false + false + false + 0 + + Datacenter Status + MSA|DATACENTER + false + 0 + false + false + false + false + params._order + + + + + + + { + "kvdc": "active", + "brf": "passive" +} + + + + +
+ @.*(?<object_id>kvdc|brf).*(?<status>active|passive)@ +
+ + + + + + + + + + diff --git a/LINUX/SYSTEM/swarm_nodes.xml b/LINUX/SYSTEM/swarm_nodes.xml new file mode 100644 index 00000000..656bfa66 --- /dev/null +++ b/LINUX/SYSTEM/swarm_nodes.xml @@ -0,0 +1,51 @@ + + + none + + object_id + + 0 + 5 + cli + + + false + false + false + 0 + + Swarm Nodes + MSA|SWARM + false + 0 + false + false + false + false + params._order + + + + + + + + + + + + SD_IP_CONFIG} /root/quickstart/scripts/inspectNodes.sh ]]> + +
+ @(?<object_id>\S+)\s+(?<role>\S+)\s+(?<availability>\S+)\s+(?<address>\S+)\s+(?<state>\S+)\s+(?<labels>(\S+:\S+\s?)+)@ +
+ + + + + + + + + + diff --git a/LINUX/SYSTEM/swarm_service_nodes.xml b/LINUX/SYSTEM/swarm_service_nodes.xml new file mode 100644 index 00000000..3b53c23a --- /dev/null +++ b/LINUX/SYSTEM/swarm_service_nodes.xml @@ -0,0 +1,57 @@ + + + none + + object_id + + 0 + 5 + cli + + + false + false + false + 0 + + Swarm Service Nodes + MSA|SWARM + false + 0 + false + false + false + false + params._order + + + + + + + + + + SD_IP_CONFIG} /root/quickstart/listServiceNodes.sh ]]> + +
+ @#+\s+(?<object_id>\S+)\s+#*@ +
+ + + + @(?<service_id>\S+)\s+(?<service_name>\S+)\s+(?<uptime>Running.*)@ + + + + + + + + + + + + + + From 9950764c303526df8d705f4cc71e2876db2fe9be Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Dec 2022 18:05:59 +0800 Subject: [PATCH 7/8] add latest Openstack post UAT --- OPENSTACK/Keystone_v3/.meta_cinder | 40 ++++ OPENSTACK/Keystone_v3/cinder/.meta_volume.xml | 43 ++++ OPENSTACK/Keystone_v3/cinder/volume.xml | 136 +++++++++++++ OPENSTACK/Keystone_v3/glance/.meta_images.xml | 4 +- OPENSTACK/Keystone_v3/glance/images.xml | 10 +- .../Keystone_v3/keystone/.meta_domains.xml | 8 +- .../Keystone_v3/keystone/.meta_roles.xml | 8 +- .../Keystone_v3/keystone/.meta_tenants.xml | 4 +- .../Keystone_v3/keystone/.meta_users.xml | 8 +- OPENSTACK/Keystone_v3/keystone/domains.xml | 96 +++++---- OPENSTACK/Keystone_v3/keystone/roles.xml | 69 ++++--- OPENSTACK/Keystone_v3/keystone/tenants.xml | 27 ++- OPENSTACK/Keystone_v3/keystone/users.xml | 118 ++++++----- .../Keystone_v3/neutron/.meta_floatingips.xml | 8 +- .../Keystone_v3/neutron/.meta_networks.xml | 8 +- OPENSTACK/Keystone_v3/neutron/.meta_ports.xml | 8 +- .../neutron/.meta_security_group_rules.xml | 4 +- .../neutron/.meta_security_groups.xml | 16 +- .../Keystone_v3/neutron/.meta_subnets.xml | 8 +- OPENSTACK/Keystone_v3/neutron/floatingips.xml | 112 +++++----- OPENSTACK/Keystone_v3/neutron/networks.xml | 192 ++++++++++-------- OPENSTACK/Keystone_v3/neutron/ports.xml | 184 ++++++++++------- .../neutron/security_group_rules.xml | 9 +- OPENSTACK/Keystone_v3/neutron/subnets.xml | 147 +++++++------- OPENSTACK/Keystone_v3/nova/.meta_flavors.xml | 4 +- OPENSTACK/Keystone_v3/nova/.meta_hosts.xml | 36 ++-- OPENSTACK/Keystone_v3/nova/.meta_keypairs.xml | 8 +- OPENSTACK/Keystone_v3/nova/.meta_servers.xml | 4 +- OPENSTACK/Keystone_v3/nova/flavors.xml | 3 +- OPENSTACK/Keystone_v3/nova/hosts.xml | 83 ++++---- OPENSTACK/Keystone_v3/nova/keypairs.xml | 79 +++---- OPENSTACK/Keystone_v3/nova/servers.xml | 34 +++- 32 files changed, 941 insertions(+), 577 deletions(-) create mode 100644 OPENSTACK/Keystone_v3/.meta_cinder create mode 100755 OPENSTACK/Keystone_v3/cinder/.meta_volume.xml create mode 100644 OPENSTACK/Keystone_v3/cinder/volume.xml mode change 100644 => 100755 OPENSTACK/Keystone_v3/neutron/.meta_floatingips.xml mode change 100644 => 100755 OPENSTACK/Keystone_v3/neutron/.meta_networks.xml mode change 100644 => 100755 OPENSTACK/Keystone_v3/neutron/.meta_subnets.xml mode change 100644 => 100755 OPENSTACK/Keystone_v3/nova/.meta_hosts.xml diff --git a/OPENSTACK/Keystone_v3/.meta_cinder b/OPENSTACK/Keystone_v3/.meta_cinder new file mode 100644 index 00000000..098f85c5 --- /dev/null +++ b/OPENSTACK/Keystone_v3/.meta_cinder @@ -0,0 +1,40 @@ + + + + + MODEL + Generic + + + DATE_MODIFICATION + 1424167255575 + + + COMMENT + + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1424167255561 + + + MANUFACTURER + + + CONFIGURATION_FILTER + + + + TYPE + DIRECTORY + + + TAG + + + + diff --git a/OPENSTACK/Keystone_v3/cinder/.meta_volume.xml b/OPENSTACK/Keystone_v3/cinder/.meta_volume.xml new file mode 100755 index 00000000..66605821 --- /dev/null +++ b/OPENSTACK/Keystone_v3/cinder/.meta_volume.xml @@ -0,0 +1,43 @@ + + + + + DISPLAYNAME + volume.xml + + + DATE_MODIFICATION + 1670508243093 + + + REPOSITORY + CommandDefinition + + + DATE_CREATION + 1670508243025 + + + MODEL + 16051904 + + + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 14020603 + + + TYPE + FILE + + + COMMENT + + + diff --git a/OPENSTACK/Keystone_v3/cinder/volume.xml b/OPENSTACK/Keystone_v3/cinder/volume.xml new file mode 100644 index 00000000..64bcbf39 --- /dev/null +++ b/OPENSTACK/Keystone_v3/cinder/volume.xml @@ -0,0 +1,136 @@ + + + none + + object_id + + 0 + 5 + xml + + + false + false + false + 0 + + Volumes + Default + false + 0 + false + false + false + false + params._order + + + + + + volume + + + availability_zones + + + + + volume + + + + + volume + + + + + volume + + + + + + Attachement + + + servers + + + + + Attachement + + + + + + + + + +
+ @^\s \s*$@ + //root/volumes/row +
+ + + + @<availabilityZone>(?<availability_zone>.*)</availabilityZone>@ + //availabilityZone + + + + @<size>(?<size>.*)</size>@ + //size + + + + @<status>(?<status>.*)</status>@ + //status + + + + @<displayName>(?<display_name>.*)</displayName>@ + //displayName + + + + @<id>(?<object_id>.*)</id>@ + //id + + + + /{$TENANT_ID}/os-volumes/detail + + + + POST#nova + /{$TENANT_ID}/os-volumes + + + + + POST#nova + /{$TENANT_ID}/servers/{$params.server_id}/os-volume_attachments + + + + nova + /{$TENANT_ID}/os-volumes/{$params.object_id|object_id} + + + diff --git a/OPENSTACK/Keystone_v3/glance/.meta_images.xml b/OPENSTACK/Keystone_v3/glance/.meta_images.xml index 47e5cee0..6db34e79 100755 --- a/OPENSTACK/Keystone_v3/glance/.meta_images.xml +++ b/OPENSTACK/Keystone_v3/glance/.meta_images.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663835715505 + 1668275504121 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1663835715478 + 1668275504102 MODEL diff --git a/OPENSTACK/Keystone_v3/glance/images.xml b/OPENSTACK/Keystone_v3/glance/images.xml index fdeeac8f..f30f2834 100644 --- a/OPENSTACK/Keystone_v3/glance/images.xml +++ b/OPENSTACK/Keystone_v3/glance/images.xml @@ -25,7 +25,7 @@ params._order - + @@ -140,7 +140,12 @@ {if !empty({$params.min_ram})} "min_ram": {$params.min_ram}, {/if} -"protected": {$params.protected} +{if !empty({$params.protected})} +"protected": true +{/if} +{if empty({$params.protected})} +"protected": false +{/if} {literal}}{/literal} ]]> POST#glance @@ -164,4 +169,5 @@ ​/v2/images/{$params.object_id|object_id}/file + diff --git a/OPENSTACK/Keystone_v3/keystone/.meta_domains.xml b/OPENSTACK/Keystone_v3/keystone/.meta_domains.xml index d58efbdc..a373d6c2 100755 --- a/OPENSTACK/Keystone_v3/keystone/.meta_domains.xml +++ b/OPENSTACK/Keystone_v3/keystone/.meta_domains.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + domains.xml + DATE_MODIFICATION - 1588580677020 + 1668318019664 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580677013 + 1668318019645 MODEL diff --git a/OPENSTACK/Keystone_v3/keystone/.meta_roles.xml b/OPENSTACK/Keystone_v3/keystone/.meta_roles.xml index 29089395..5d08944a 100755 --- a/OPENSTACK/Keystone_v3/keystone/.meta_roles.xml +++ b/OPENSTACK/Keystone_v3/keystone/.meta_roles.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + roles.xml + DATE_MODIFICATION - 1588580824823 + 1664343292029 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580824814 + 1664343292009 MODEL diff --git a/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml b/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml index 67b2bccd..77166920 100755 --- a/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml +++ b/OPENSTACK/Keystone_v3/keystone/.meta_tenants.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663730045432 + 1668402851645 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1663730045397 + 1668402851625 MODEL diff --git a/OPENSTACK/Keystone_v3/keystone/.meta_users.xml b/OPENSTACK/Keystone_v3/keystone/.meta_users.xml index 23802808..dc08866b 100755 --- a/OPENSTACK/Keystone_v3/keystone/.meta_users.xml +++ b/OPENSTACK/Keystone_v3/keystone/.meta_users.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + users.xml + DATE_MODIFICATION - 1588580694134 + 1668443611437 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588580694119 + 1668443611417 MODEL diff --git a/OPENSTACK/Keystone_v3/keystone/domains.xml b/OPENSTACK/Keystone_v3/keystone/domains.xml index f3558a6c..2bcd9573 100644 --- a/OPENSTACK/Keystone_v3/keystone/domains.xml +++ b/OPENSTACK/Keystone_v3/keystone/domains.xml @@ -1,106 +1,120 @@ - - + + + /images/repository/CommandDefinition/icons/pad.jpg + + name + + 10000 + 5 xml false - - name false - Keystone - /images/repository/CommandDefinition/icons/pad.jpg false - false - 1 0 - domains - 10000 + domains + Keystone + false + 1 false true true true params._order - 5 - - - - - - + + + + + + + + - keystone - /domains +
+ @^\s \s*$@ //root/domains/row
+ + @<id>(?<object_id>.*)</id>@ id - @<id>(?<object_id>.*)<id>@ - name + @<name>(?<name>.*)</name>@ + name - enabled + @<enabled>(?<enabled>.*)</enabled>@ + enabled - description + @<description>(?<description>.*)</description>@ + description - + /domains - POST#keystone - - /domains - - {literal}{{/literal} + - - - PATCH#keystone +]]> + POST#keystone - ​/domains/{$params.object_id|object_id} + /domains - {literal}{{/literal} + + + +]]> + PATCH#keystone + + ​/domains/{$params.object_id|object_id} + + keystone - ​/domains/{$params.object_id|object_id} + ​/domains/{$params.object_id|object_id} - - + diff --git a/OPENSTACK/Keystone_v3/keystone/roles.xml b/OPENSTACK/Keystone_v3/keystone/roles.xml index 1415f4f0..b0933948 100644 --- a/OPENSTACK/Keystone_v3/keystone/roles.xml +++ b/OPENSTACK/Keystone_v3/keystone/roles.xml @@ -1,75 +1,78 @@ - - + + + /images/repository/CommandDefinition/icons/access gateway.jpg + + name + + 10000 + 5 xml false - - name false - Keystone - /images/repository/CommandDefinition/icons/access gateway.jpg false - false - 1 0 - Roles - 10000 + Roles + Keystone + false + 1 false true true true params._order - 5 - - - - + + + + + + Click here and paste your configuration example that represent the object OR a complete existant Object definition file. - - keystone - /roles +
+ @^\s \s*$@ //root/roles/row
- id + @<id>(?<object_id>.*)</id>@ + id - name + @<name>(?<name>.*)</name>@ + name - - + /roles - - - POST#keystone - - /roles - - {literal}{{/literal} + + +]]> + POST#keystone + + /roles + + keystone /roles/{$params.object_id|object_id} - - - \ No newline at end of file + + diff --git a/OPENSTACK/Keystone_v3/keystone/tenants.xml b/OPENSTACK/Keystone_v3/keystone/tenants.xml index 536e1d1a..4f361687 100644 --- a/OPENSTACK/Keystone_v3/keystone/tenants.xml +++ b/OPENSTACK/Keystone_v3/keystone/tenants.xml @@ -2,7 +2,7 @@ /images/repository/CommandDefinition/icons/androgenous person.jpg - name + tenant_domain 1 5 @@ -25,20 +25,10 @@ params._order - + - - - roles - - - - - users - - domains @@ -50,6 +40,7 @@ tenants + Click here and paste your configuration example that represent the object OR a complete existant Object definition file. @@ -63,13 +54,19 @@ ,"description": "{$params.description}" {/if} {if !empty($params.enabled)} -,"enabled": {$params.enabled} +,"enabled": true +{/if} +{if empty($params.enabled)} +,"enabled": false {/if} {if !empty($params.domain_id)} ,"domain_id": "{$params.domain_id}" {/if} {if !empty($params.is_domain)} -,"is_domain": {$params.is_domain} +,"is_domain": true +{/if} +{if empty($params.is_domain)} +,"is_domain": false {/if} {if !empty($params.parent_id)} ,"parent_id": "{$params.parent_id}" @@ -84,6 +81,7 @@ + {assign_object_variable var="tenant_domain" value="{$params.name}-{$params.domain_id}"}
@^\s \s*$@ @@ -161,4 +159,5 @@ ​/projects/{$params.object_id|object_id} + diff --git a/OPENSTACK/Keystone_v3/keystone/users.xml b/OPENSTACK/Keystone_v3/keystone/users.xml index 31a20893..83eace18 100644 --- a/OPENSTACK/Keystone_v3/keystone/users.xml +++ b/OPENSTACK/Keystone_v3/keystone/users.xml @@ -1,54 +1,60 @@ - - + + + /images/repository/CommandDefinition/icons/pc man.jpg + + name + + 10000 + 5 xml false - - name false - Keystone - /images/repository/CommandDefinition/icons/pc man.jpg false + 0 + + Users + Keystone false 1 - Users - 10000 - false - false true true true params._order - 5 - - - - + + + + + tenants - - - - - + + + + + + domains + + + + Click here and paste your configuration example that represent the object OR a complete existant Object definition file. - - POST#keystone - - /users - - {literal}{{/literal} + + +]]> + POST#keystone + + /users + - keystone - /users +
+ @^\s \s*$@ //root/users/row
- id + @<id>(?<object_id>.*)</id>@ + id - - email + @<email>(?<email>.*)</email>@ + email - enabled + @<enabled>(?<enabled>.*)</enabled>@ + enabled - name + @<name>(?<name>.*)</name>@ + name - username + @<username>(?<username>.*)</username>@ + username - + /users - - PUT#keystone - - /users/{$params.object_id|object_id} - - {literal}{{/literal} + + +]]> + PUT#keystone + + /users/{$params.object_id|object_id} - + + keystone - ​/users/{$params.object_id|object_id} + ​/users/{$params.object_id|object_id} - - + diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_floatingips.xml b/OPENSTACK/Keystone_v3/neutron/.meta_floatingips.xml old mode 100644 new mode 100755 index 3f98face..4b649b47 --- a/OPENSTACK/Keystone_v3/neutron/.meta_floatingips.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_floatingips.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + floatingips.xml + DATE_MODIFICATION - 1588582707021 + 1667822644317 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1667822644298 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_networks.xml b/OPENSTACK/Keystone_v3/neutron/.meta_networks.xml old mode 100644 new mode 100755 index 3f98face..13152cb2 --- a/OPENSTACK/Keystone_v3/neutron/.meta_networks.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_networks.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + networks.xml + DATE_MODIFICATION - 1588582707021 + 1668153270118 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1668153270099 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_ports.xml b/OPENSTACK/Keystone_v3/neutron/.meta_ports.xml index 3f98face..3e6bd93c 100755 --- a/OPENSTACK/Keystone_v3/neutron/.meta_ports.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_ports.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + ports.xml + DATE_MODIFICATION - 1588582707021 + 1669971615333 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1669971615293 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml b/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml index 84ef3e4d..1afda2ed 100755 --- a/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_security_group_rules.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663754458543 + 1664281428311 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1663754458514 + 1664281428281 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml b/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml index 7f697b04..6e2bc3ef 100755 --- a/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_security_groups.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663753108737 + 1669957839929 REPOSITORY @@ -15,23 +15,11 @@ DATE_CREATION - 1663753108707 - - - MODEL - 16051904 + 1669957839929 TAG - - FILE_TYPE - text - - - MANUFACTURER - 14020603 - TYPE FILE diff --git a/OPENSTACK/Keystone_v3/neutron/.meta_subnets.xml b/OPENSTACK/Keystone_v3/neutron/.meta_subnets.xml old mode 100644 new mode 100755 index 3f98face..04a11610 --- a/OPENSTACK/Keystone_v3/neutron/.meta_subnets.xml +++ b/OPENSTACK/Keystone_v3/neutron/.meta_subnets.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + subnets.xml + DATE_MODIFICATION - 1588582707021 + 1670042155600 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1670042155559 MODEL diff --git a/OPENSTACK/Keystone_v3/neutron/floatingips.xml b/OPENSTACK/Keystone_v3/neutron/floatingips.xml index 18a4054a..1fbf4dd4 100644 --- a/OPENSTACK/Keystone_v3/neutron/floatingips.xml +++ b/OPENSTACK/Keystone_v3/neutron/floatingips.xml @@ -1,107 +1,113 @@ - - + + + /images/repository/CommandDefinition/icons/ip.jpg + + floating_network_id + + 10000 + 5 xml false - - floating_network_id false - Neutron - /images/repository/CommandDefinition/icons/ip.jpg false - false - 3 0 - Floating IPs - 10000 + Floating IPs + Neutron + false + 3 false true true true params._order - 5 - - - - - - + + + + + + + networks - + routers - + ports - + tenants - + + - - neutron - /v2.0/floatingips + +
+ @^\s \s*$@ //root/floatingips/row
- id + @<id>(?<object_id>.*)</id>@ + id - fixed_ip_address + @<fixed_ip_address>(?<fixed_ip_address>.*)</fixed_ip_address>@ + fixed_ip_address - - floating_ip_address + @<floating_ip_address>(?<floating_ip_address>.*)</floating_ip_address>@ + floating_ip_address - floating_network_id + @<floating_network_id>(?<floating_network_id>.*)</floating_network_id>@ + floating_network_id - port_id + @<port_id>(?<port_id>.*)</port_id>@ + port_id - router_id + @<router_id>(?<router_id>.*)</router_id>@ + router_id - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - status + @<status>(?<status>.*)</status>@ + status - + /v2.0/floatingips - - POST#neutron - - /v2.0/floatingips - - {literal}{{/literal} + + +]]> + POST#neutron + + /v2.0/floatingips + - + neutron /v2.0/floatingips/{$params.object_id|object_id} - - - - PUT#neutron - - /v2.0/floatingips/{$params.object_id|object_id} - - {literal}{{/literal} + + +]]> + PUT#neutron + + /v2.0/floatingips/{$params.object_id|object_id} + + diff --git a/OPENSTACK/Keystone_v3/neutron/networks.xml b/OPENSTACK/Keystone_v3/neutron/networks.xml index bce4d44a..981d1261 100644 --- a/OPENSTACK/Keystone_v3/neutron/networks.xml +++ b/OPENSTACK/Keystone_v3/neutron/networks.xml @@ -1,153 +1,164 @@ - - + + + /images/repository/CommandDefinition/icons/network management.jpg + + name + + 10000 + 5 xml false - - name false - Neutron - /images/repository/CommandDefinition/icons/network management.jpg false - false - 1 0 - Networks - 10000 + Networks + Neutron + false + 1 false true true true params._order - 5 - - - - - - + + + + + + + - gre - vxlan - flat - vlan + gre + vxlan + flat + vlan - - - - -
Subnets
- - - subnets - - - - - - - - - tenants - - - + + + + + + + + + + - neutron - /v2.0/networks +
+ @^\s \s*$@ //root/networks/row
- id + @<id>(?<object_id>.*)</id>@ + id - shared + @<shared>(?<shared>.*)</shared>@ + shared - external + @<external>(?<router_external>.*)</external>@ + external - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - name + @<name>(?<name>.*)</name>@ + name - status + @<status>(?<status>.*)</status>@ + status - network_type + @<network_type>(?<network_type>.*)</network_type>@ + network_type - admin_state_up + @<admin_state_up>(?<admin_state_up>.*)</admin_state_up>@ + admin_state_up - - physical_network + @<physical_network>(?<physical_network>.*)</physical_network>@ + physical_network - port_security_enabled + @<port_security_enabled>(?<port_security_enabled>.*)</port_security_enabled>@ + port_security_enabled - mtu + @<mtu>(?<mtu>.*)</mtu>@ + mtu - segmentation_id + @<segmentation_id>(?<segmentation_id>.*)</segmentation_id>@ + segmentation_id - - subnets/row - //row + @<row>(?<subnet_id>.*)</row>@ + //row - - + subnets/row + + - - - - + /v2.0/networks - - POST#neutron - - /v2.0/networks - - {literal}{{/literal} + + - - - neutron +]]> + POST#neutron - ​/v2.0/networks/{$params.object_id|object_id} + /v2.0/networks - - - - PUT#neutron + + + neutron - /v2.0/networks/{$params.object_id|object_id}​ + ​/v2.0/networks/{$params.object_id|object_id} - {literal}{{/literal} + + + +]]> + PUT#neutron + + /v2.0/networks/{$params.object_id|object_id}​ + + diff --git a/OPENSTACK/Keystone_v3/neutron/ports.xml b/OPENSTACK/Keystone_v3/neutron/ports.xml index 09a0f697..83a1bac5 100755 --- a/OPENSTACK/Keystone_v3/neutron/ports.xml +++ b/OPENSTACK/Keystone_v3/neutron/ports.xml @@ -1,169 +1,194 @@ - - + + + /images/repository/CommandDefinition/icons/pc.jpg + + name + + 10000 + 5 xml false - - name false - name - /images/repository/CommandDefinition/icons/pc.jpg false - false - 4 0 - Ports - 10000 + Ports + name + false + 4 false true true true params._order - 5 - - - - + + + + + networks - - -
Fixed IPs
- + subnets - + -
Fixed IPs
+ Fixed IPs - - - - - - - - + + + + + + + -
Security Groups
+ Security Groups security_groups - - - tenants - + + + + normal + macvtap + direct + baremetal + direct-physical + virtio-forwarder + - + + - neutron - /v2.0/ports +
+ @^\s \s*$@ //root/ports/row
- id + @<id>(?<object_id>.*)</id>@ + id - name + @<name>(?<name>.*)</name>@ + name - - status + @<status>(?<status>.*)</status>@ + status - admin_state_up + @<admin_state_up>(?<admin_state_up>.*)</admin_state_up>@ + admin_state_up - network_id + @<network_id>(?<network_id>.*)</network_id>@ + network_id - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - mac_address + @<mac_address>(?<mac_address>.*)</mac_address>@ + mac_address - device_owner + @<device_owner>(?<device_owner>.*)</device_owner>@ + device_owner - device_id + @<device_id>(?<device_id>.*)</device_id>@ + device_id - port_security_enabled + @<port_security_enabled>(?<port_security_enabled>.*)</port_security_enabled>@ + port_security_enabled - security_groups/row - //row + @<row>(?<security_group_id>.*)</row>@ + //row + security_groups/row + + - fixed_ips/row - subnet_id + @<subnet_id>(?<subnet_id>.*)</subnet_id>@ + subnet_id - ip_address + @<ip_address>(?<ip_address>.*)</ip_address>@ + ip_address + fixed_ips/row + + - + /v2.0/ports - - POST#neutron - - /v2.0/ports - - {literal}{{/literal} + + 1},{/if} "{$security_group.security_group_id}" {/foreach} ] @@ -171,7 +196,7 @@ {if !empty($params.fixed_ips)} ,"fixed_ips":[ {foreach $params.fixed_ips as $fixed_ip} -{if $fixed_ip@iteration > 1},{/if} +{if $fixed_ip@iteration > 1},{/if} {literal}{{/literal} "subnet_id": "{$fixed_ip.subnet_id}", "ip_address": "{$fixed_ip.ip_address}" @@ -181,22 +206,22 @@ {/if} {literal}}{/literal} {literal}}{/literal} - - - - neutron +]]> + POST#neutron - ​/v2.0/ports/{$params.object_id|object_id} + /v2.0/ports - - - - PUT#neutron + + + neutron - ​/v2.0/ports/{$params.object_id|object_id} + ​/v2.0/ports/{$params.object_id|object_id} - {literal}{{/literal} + + + 1},{/if} {if empty($security_group.security_group_id)}{break}{/if} "{$security_group.security_group_id}" {/foreach} @@ -219,7 +244,7 @@ {if !empty($params.fixed_ips)} ,"fixed_ips":[ {foreach $params.fixed_ips as $fixed_ip} -{if $fixed_ip@iteration > 1},{/if} +{if $fixed_ip@iteration > 1},{/if} {literal}{{/literal} "subnet_id": "{$fixed_ip.subnet_id}", "ip_address": "{$fixed_ip.ip_address}" @@ -229,6 +254,11 @@ {/if} {literal}}{/literal} {literal}}{/literal} - +]]> + PUT#neutron + + ​/v2.0/ports/{$params.object_id|object_id} + + diff --git a/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml b/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml index 54bf7379..5670a936 100644 --- a/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml +++ b/OPENSTACK/Keystone_v3/neutron/security_group_rules.xml @@ -39,10 +39,11 @@ - udp - null - icmp - tcp + udp + null + icmp + tcp + sctp diff --git a/OPENSTACK/Keystone_v3/neutron/subnets.xml b/OPENSTACK/Keystone_v3/neutron/subnets.xml index 19605dbe..f88b6d52 100644 --- a/OPENSTACK/Keystone_v3/neutron/subnets.xml +++ b/OPENSTACK/Keystone_v3/neutron/subnets.xml @@ -1,132 +1,136 @@ - - + + + /images/repository/CommandDefinition/icons/network management.jpg + + name + + 10000 + 5 xml false - - name false - Neutron - /images/repository/CommandDefinition/icons/network management.jpg false - false - 1 0 - Subnets - 10000 + Subnets + Neutron + false + 1 false true true true params._order - 5 - - - - - - + + + + + + + - 4 - 6 + 4 + 6 - - + + -
Allocation pools
+ Allocation pools - + -
Allocation pools
+ Allocation pools - + networks - - - tenants - - - + + + - - neutron - /v2.0/subnets + + + {if empty($params.name)}{assign_object_variable var="name" value="{$params.object_id}"}{/if}
+ @^\s \s*$@ //root/subnets/row
- id + @<id>(?<object_id>.*)</id>@ + id - network_id + @<network_id>(?<network_id>.*)</network_id>@ + network_id - enable_dhcp + @<enable_dhcp>(?<enable_dhcp>.*)</enable_dhcp>@ + enable_dhcp - name + @<name>(?<name>.*)</name>@ + name - cidr + @<cidr>(?<cidr>.*)</cidr>@ + cidr - gateway_ip + @<gateway_ip>(?<gateway_ip>.*)</gateway_ip>@ + gateway_ip - ip_version + @<ip_version>(?<ip_version>.*)</ip_version>@ + ip_version - - - - - tenant_id + @<tenant_id>(?<tenant_id>.*)</tenant_id>@ + tenant_id - allocation_pools/row - start + @<start>(?<start>.*)</start>@ + start - end + @<end>(?<end>.*)</end>@ + end + allocation_pools/row + + - + /v2.0/subnets - - POST#neutron - - /v2.0/subnets - - {literal}{{/literal} + + 1},{/if} {literal}{{/literal} "start": "{$allocation_pool.start}", "end": "{$allocation_pool.end}" @@ -152,22 +156,22 @@ {/if} {literal}}{/literal} {literal}}{/literal} - - - - neutron +]]> + POST#neutron - /v2.0/subnets/{$params.object_id|object_id} + /v2.0/subnets - - - - PUT#neutron + + + neutron /v2.0/subnets/{$params.object_id|object_id} - {literal}{{/literal} + + + 1},{/if} {literal}{{/literal} "start": "{$allocation_pool.start}", "end": "{$allocation_pool.end}" @@ -191,6 +195,11 @@ {/if} {literal}}{/literal} {literal}}{/literal} - +]]> + PUT#neutron + + /v2.0/subnets/{$params.object_id|object_id} + + diff --git a/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml b/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml index 696397a5..0c66c240 100755 --- a/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_flavors.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663764226149 + 1669643774612 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1663764226125 + 1669643774542 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/.meta_hosts.xml b/OPENSTACK/Keystone_v3/nova/.meta_hosts.xml old mode 100644 new mode 100755 index 5b1b87d3..37838bb2 --- a/OPENSTACK/Keystone_v3/nova/.meta_hosts.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_hosts.xml @@ -2,20 +2,12 @@ - MODEL - 16051904 - - - FILE_TYPE - text + DISPLAYNAME + hosts.xml DATE_MODIFICATION - 1571243230176 - - - COMMENT - + 1670592284671 REPOSITORY @@ -23,23 +15,29 @@ DATE_CREATION - 1571241078559 + 1670592284596 - MANUFACTURER - 14020603 + MODEL + 16051904 - CONFIGURATION_FILTER - + TAG + + + FILE_TYPE + text + + + MANUFACTURER + 14020603 TYPE - UPLOAD + FILE - TAG - hosts.xml + COMMENT diff --git a/OPENSTACK/Keystone_v3/nova/.meta_keypairs.xml b/OPENSTACK/Keystone_v3/nova/.meta_keypairs.xml index 3f98face..5673c01d 100755 --- a/OPENSTACK/Keystone_v3/nova/.meta_keypairs.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_keypairs.xml @@ -1,9 +1,13 @@ + + DISPLAYNAME + keypairs.xml + DATE_MODIFICATION - 1588582707021 + 1669639578337 REPOSITORY @@ -11,7 +15,7 @@ DATE_CREATION - 1588582707015 + 1669639578235 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/.meta_servers.xml b/OPENSTACK/Keystone_v3/nova/.meta_servers.xml index 645d2e2d..e0e9a6d5 100755 --- a/OPENSTACK/Keystone_v3/nova/.meta_servers.xml +++ b/OPENSTACK/Keystone_v3/nova/.meta_servers.xml @@ -7,7 +7,7 @@ DATE_MODIFICATION - 1663836366669 + 1668433617537 REPOSITORY @@ -15,7 +15,7 @@ DATE_CREATION - 1663836366636 + 1668433617505 MODEL diff --git a/OPENSTACK/Keystone_v3/nova/flavors.xml b/OPENSTACK/Keystone_v3/nova/flavors.xml index 08fa0294..6e4bf9d1 100644 --- a/OPENSTACK/Keystone_v3/nova/flavors.xml +++ b/OPENSTACK/Keystone_v3/nova/flavors.xml @@ -25,7 +25,7 @@ params._order - + @@ -111,6 +111,7 @@ {if !empty($params.ephemeral)} ,"OS-FLV-EXT-DATA:ephemeral": {$params.ephemeral} {/if} +,"os-flavor-access:is_public": true {literal}}{/literal} {literal}}{/literal} ]]> diff --git a/OPENSTACK/Keystone_v3/nova/hosts.xml b/OPENSTACK/Keystone_v3/nova/hosts.xml index 181a21f8..a9a2c723 100644 --- a/OPENSTACK/Keystone_v3/nova/hosts.xml +++ b/OPENSTACK/Keystone_v3/nova/hosts.xml @@ -1,36 +1,39 @@ - - + + + /images/repository/CommandDefinition/icons/www server.jpg + + object_id + + 10000 + 5 xml true - - host false - Nova - /images/repository/CommandDefinition/icons/www server.jpg false - false - 4 0 - Hosts - 10000 + Hosts + Nova + false + 4 false true true true params._order - 5 - - - - - - - - - <?xml version="1.0" encoding="UTF-8" ?> + + + + + + + + + + + <?xml version="1.0" encoding="UTF-8" ?> <root> <hypervisors> <hypervisor_hostname>host1</hypervisor_hostname> @@ -45,50 +48,38 @@ </root> - - nova - /os-hypervisors + + + {assign_object_variable var="host" value="{$params.hypervisor_hostname} [ID: {$params.object_id} - State: {$params.state} - State: {$params.status}]"}
+ @^\s \s*$@ //root/hypervisors/row
+ + @<id>(?<hypervisor_hostname>.*)</id>@ id - @<id>(?<object_id>.*)</id>@ - - - - - - + + @<hypervisor_hostname>(?<object_id>.*)</hypervisor_hostname>@ hypervisor_hostname - @<hypervisor_hostname>(?<hypervisor_hostname>.*)</hypervisor_hostname>@ - - status + @<status>(?<status>.*)</status>@ + status - state + @<state>(?<state>.*)</state>@ + state - - - - - - - - - {assign_object_variable var="host" value="{$params.hypervisor_hostname} [ID: {$params.object_id} - State: {$params.state} - State: {$params.status}]"} + /os-hypervisors - - - + diff --git a/OPENSTACK/Keystone_v3/nova/keypairs.xml b/OPENSTACK/Keystone_v3/nova/keypairs.xml index 858839d3..45033741 100644 --- a/OPENSTACK/Keystone_v3/nova/keypairs.xml +++ b/OPENSTACK/Keystone_v3/nova/keypairs.xml @@ -1,84 +1,91 @@ - - + + + /images/repository/CommandDefinition/icons/key.jpg + + object_id + + 10000 + 5 xml false - - object_id false - Nova - /images/repository/CommandDefinition/icons/key.jpg false - false - 2 0 - Keypairs - 10000 + Keypairs + Nova + false + 2 false true true true params._order - 5 - - - - - + + + + + + + + - nova - /{$TENANT_ID}/os-keypairs +
+ @^\s \s*$@ //root/keypairs/row
- keypair/name + @<name>(?<object_id>.*)</name>@ + keypair/name - keypair/fingerprint + @<fingerprint>(?<fingerprint>.*)</fingerprint>@ + keypair/fingerprint - keypair/public_key + @<public_key>(?<public_key>.*)</public_key>@ + keypair/public_key - - + /{$TENANT_ID}/os-keypairs - - - - - POST#nova - - /{$TENANT_ID}/os-keypairs - - {literal}{{/literal} + + +]]> + POST#nova + + /{$TENANT_ID}/os-keypairs + - + + nova /{$TENANT_ID}/os-keypairs/{$params.object_id|object_id} - - + diff --git a/OPENSTACK/Keystone_v3/nova/servers.xml b/OPENSTACK/Keystone_v3/nova/servers.xml index 1c500e32..cc2d9bb1 100755 --- a/OPENSTACK/Keystone_v3/nova/servers.xml +++ b/OPENSTACK/Keystone_v3/nova/servers.xml @@ -113,7 +113,11 @@ keypairs - + + + tenants + + availability_zones @@ -192,6 +196,11 @@ swap + + + Block Device Mapping V2 + + Block Device Mapping V2 @@ -201,6 +210,11 @@ -1 + + + Block Device Mapping V2 + + Links @@ -991,21 +1005,27 @@ {literal}}{/literal} {/if} {if !empty($params.config_drive)} -,"config_drive": "{$params.config_drive}" +,"config_drive": {$params.config_drive} {/if} {if !empty($params.block_device_mapping_v2)} ,"block_device_mapping_v2":[ {foreach $params.block_device_mapping_v2 as $block_device_mapping} {if $block_device_mapping@iteration > 1},{/if} {literal}{{/literal} -"device_name": "{$block_device_mapping.device_name}", +"uuid": "{$block_device_mapping.uuid}", +"volume_size":"{$block_device_mapping.volume_size}", +{if !empty($block_device_mapping.source_type)} "source_type": "{$block_device_mapping.source_type}", -"delete_on_termination": "{$block_device_mapping.delete_on_termination}", -"guest_format": "{$block_device_mapping.guest_format}", -"boot_index": "{$block_device_mapping.boot_index}" +{/if} {if !empty($block_device_mapping.destination_type)} -,"destination_type": "{$block_device_mapping.destination_type}" +"destination_type": "{$block_device_mapping.destination_type}", +{/if} +{if !empty($block_device_mapping.delete_on_termination)} +"delete_on_termination": {$block_device_mapping.delete_on_termination}, +{/if}{if !empty($block_device_mapping.guest_format)} +"guest_format": "{$block_device_mapping.guest_format}", {/if} +"boot_index": {$block_device_mapping.boot_index} {literal}}{/literal} {/foreach} ] From b5b9c0aa1584142c74d1c1444e371bde09180e49 Mon Sep 17 00:00:00 2001 From: Vincent MONNIER <80886295+vmonnier@users.noreply.github.com> Date: Thu, 2 May 2024 13:16:06 +0200 Subject: [PATCH 8/8] Update License.xml adding import of new Maintenance (MAINT) license tpye --- LINUX/MSA_LICENSE/License.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LINUX/MSA_LICENSE/License.xml b/LINUX/MSA_LICENSE/License.xml index 98184448..65af2e46 100644 --- a/LINUX/MSA_LICENSE/License.xml +++ b/LINUX/MSA_LICENSE/License.xml @@ -65,7 +65,7 @@ - @\s+\.\.(?<license_type>PROD|POC|LAB)@ + @\s+\.\.(?<license_type>PROD|POC|LAB|MAINT)@