From 86fb1c2377539ccd9784bd6a4752e15db55b7b65 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Fri, 7 Jun 2024 19:26:37 +0200 Subject: [PATCH] Update tool scripts update scripts with shortcuts for generations. Change-Id: I7f44522ee1b0b76fbf1ff6000ce31f9cc4b3fe5d --- tools/generate_openapi_specs.sh | 12 ++++++------ tools/generate_rust_block_storage.sh | 20 +++++++++++++++++++- tools/generate_rust_object_store.sh | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 7 deletions(-) create mode 100755 tools/generate_rust_object_store.sh diff --git a/tools/generate_openapi_specs.sh b/tools/generate_openapi_specs.sh index 778327a..6922a50 100755 --- a/tools/generate_openapi_specs.sh +++ b/tools/generate_openapi_specs.sh @@ -6,27 +6,27 @@ SERVICE=$1 API_REF_BUILD_ROOT=~/workspace/opendev/openstack if [ -z "$1" -o "$1" = "compute" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type compute --api-ref-src ${API_REF_BUILD_ROOT}/nova/api-ref/build/html/index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type compute --api-ref-src ${API_REF_BUILD_ROOT}/nova/api-ref/build/html/index.html --validate fi if [ -z "$1" -o "$1" = "network" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type network --api-ref-src ${API_REF_BUILD_ROOT}/neutron-lib/api-ref/build/html/v2/index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type network --api-ref-src ${API_REF_BUILD_ROOT}/neutron-lib/api-ref/build/html/v2/index.html --validate fi if [ -z "$1" -o "$1" = "block-storage" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type volume --api-ref-src ${API_REF_BUILD_ROOT}/cinder/api-ref/build/html/v3/index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type volume --api-ref-src ${API_REF_BUILD_ROOT}/cinder/api-ref/build/html/v3/index.html --validate fi if [ -z "$1" -o "$1" = "image" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type image --api-ref-src ${API_REF_BUILD_ROOT}/glance/api-ref/build/html/v2/index.html --api-ref-src ${API_REF_BUILD_ROOT}/glance/api-ref/build/html/v2/metadefs-index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type image --api-ref-src ${API_REF_BUILD_ROOT}/glance/api-ref/build/html/v2/index.html --api-ref-src ${API_REF_BUILD_ROOT}/glance/api-ref/build/html/v2/metadefs-index.html --validate sed -i "s|\[API versions call\](../versions/index.html#versions-call)|API versions call|g" wrk/openapi_specs/image/v2.yaml fi if [ -z "$1" -o "$1" = "identity" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type identity --api-ref-src ${API_REF_BUILD_ROOT}/keystone/api-ref/build/html/v3/index.html --api-ref-src ${API_REF_BUILD_ROOT}/keystone/api-ref/build/html/v3-ext/index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type identity --api-ref-src ${API_REF_BUILD_ROOT}/keystone/api-ref/build/html/v3/index.html --api-ref-src ${API_REF_BUILD_ROOT}/keystone/api-ref/build/html/v3-ext/index.html --validate fi if [ -z "$1" -o "$1" = "load-balancer" ]; then openstack-codegenerator --work-dir wrk --target openapi-spec --service-type load-balancer --api-ref-src ${API_REF_BUILD_ROOT}/octavia/api-ref/build/html/v2/index.html --validate fi if [ -z "$1" -o "$1" = "placement" ]; then - openstack-codegenerator --work-dir wrk --target openapi-spec --service-type placement --api-ref-src ${API_REF_BUILD_ROOT}/placement/api-ref/build/html/index.html + openstack-codegenerator --work-dir wrk --target openapi-spec --service-type placement --api-ref-src ${API_REF_BUILD_ROOT}/placement/api-ref/build/html/index.html --validate sed -i "s/(?expanded=delete-resource-provider-inventories-detail#delete-resource-provider-inventories)//" wrk/openapi_specs/placement/v1.yaml fi diff --git a/tools/generate_rust_block_storage.sh b/tools/generate_rust_block_storage.sh index b5ad1f3..6c5b61e 100755 --- a/tools/generate_rust_block_storage.sh +++ b/tools/generate_rust_block_storage.sh @@ -5,9 +5,27 @@ WRK_DIR=wrk METADATA=metadata DST=~/workspace/github/gtema/openstack NET_RESOURCES=( + "availability_zone" + "attachment" "backup" - "volume" + "cluster" + "default_type" + "extension" + "group" + "group_snapshot" + "group_type" + "host" + "limit" + "message" + "qos_spec" + "resource_filter" + "snapshot" + "snapshot_manage" "type" + "volume" + "volume_manage" + "os_volume_transfer" + "volume_transfer" ) openstack-codegenerator --work-dir ${WRK_DIR} --target rust-sdk --metadata ${METADATA}/block-storage_metadata.yaml --service block-storage diff --git a/tools/generate_rust_object_store.sh b/tools/generate_rust_object_store.sh new file mode 100755 index 0000000..671aed9 --- /dev/null +++ b/tools/generate_rust_object_store.sh @@ -0,0 +1,20 @@ +#!/usr/bin/bash -e +# + +WRK_DIR=wrk +METADATA=metadata +DST=~/workspace/github/gtema/openstack +NET_RESOURCES=( + "account" +) + +openstack-codegenerator --work-dir ${WRK_DIR} --target rust-sdk --metadata ${METADATA}/object-store_metadata.yaml --service object-store +# openstack-codegenerator --work-dir ${WRK_DIR} --target rust-cli --metadata ${METADATA}/object-store_metadata.yaml --service object-store + + +for resource in "${NET_RESOURCES[@]}"; do + cp -av "${WRK_DIR}/rust/openstack_sdk/src/api/object_store/v1/${resource}" ${DST}/openstack_sdk/src/api/object_store/v1 + cp -av "${WRK_DIR}/rust/openstack_sdk/src/api/object_store/v1/${resource}.rs" ${DST}/openstack_sdk/src/api/object_store/v1 + #cp -av "${WRK_DIR}/rust/openstack_cli/src/object_store/v1/${resource}" ${DST}/openstack_cli/src/object_store/v1 + #cp -av "${WRK_DIR}/rust/openstack_cli/tests/object_store/v1/${resource}" ${DST}/openstack_cli/tests/object_store/v1 +done;