Skip to content

Commit

Permalink
F OpenNebula#4950: add JSON and YAML outputs (OpenNebula#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alejandro Huertas Herrero authored and atodorov-storpool committed Nov 24, 2020
1 parent 5401eb4 commit 6a86457
Show file tree
Hide file tree
Showing 30 changed files with 467 additions and 90 deletions.
54 changes: 54 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ SHARE_DIRS="$SHARE_LOCATION/examples \
$SHARE_LOCATION/oneprovision \
$SHARE_LOCATION/schemas \
$SHARE_LOCATION/schemas/libvirt \
$SHARE_LOCATION/schemas/xsd \
$SHARE_LOCATION/ssh \
$SHARE_LOCATION/start-scripts \
$SHARE_LOCATION/conf \
Expand Down Expand Up @@ -666,6 +667,7 @@ INSTALL_FILES=(
VENDOR_DIRS:$LIB_LOCATION/ruby/vendors
START_SCRIPT_SHARE_FILES:$SHARE_LOCATION/start-scripts
LIBVIRT_RNG_SHARE_MODULE_FILES:$SHARE_LOCATION/schemas/libvirt
XSD_FILES:$SHARE_LOCATION/schemas/xsd
SSH_SH_LIB_FILES:$LIB_LOCATION/sh
SSH_SH_OVERRIDE_LIB_FILES:$LIB_LOCATION/sh/override
SSH_SHARE_FILES:$SHARE_LOCATION/ssh
Expand Down Expand Up @@ -2684,6 +2686,58 @@ LIBVIRT_RNG_SHARE_MODULE_FILES="share/schemas/libvirt/basictypes.rng \
share/schemas/libvirt/nwfilter_params.rng \
share/schemas/libvirt/storagecommon.rng"

#-------------------------------------------------------------------------------
# XSD
#-------------------------------------------------------------------------------

XSD_FILES="share/doc/xsd/acct.xsd \
share/doc/xsd/acl_pool.xsd
share/doc/xsd/api_info.xsd
share/doc/xsd/cluster.xsd
share/doc/xsd/cluster_pool.xsd
share/doc/xsd/datastore.xsd
share/doc/xsd/datastore_pool.xsd
share/doc/xsd/document.xsd
share/doc/xsd/document_pool.xsd
share/doc/xsd/group.xsd
share/doc/xsd/group_pool.xsd
share/doc/xsd/hook.xsd
share/doc/xsd/hook_message_api.xsd
share/doc/xsd/hook_message_retry.xsd
share/doc/xsd/hook_message_state.xsd
share/doc/xsd/hook_pool.xsd
share/doc/xsd/host.xsd
share/doc/xsd/host_pool.xsd
share/doc/xsd/image.xsd
share/doc/xsd/image_pool.xsd
share/doc/xsd/index.xsd
share/doc/xsd/marketplace.xsd
share/doc/xsd/marketplace_pool.xsd
share/doc/xsd/marketplaceapp.xsd
share/doc/xsd/marketplaceapp_pool.xsd
share/doc/xsd/raftstatus.xsd
share/doc/xsd/security_group.xsd
share/doc/xsd/security_group_pool.xsd
share/doc/xsd/showback.xsd
share/doc/xsd/user.xsd
share/doc/xsd/user_pool.xsd
share/doc/xsd/vdc.xsd
share/doc/xsd/vdc_pool.xsd
share/doc/xsd/vm.xsd
share/doc/xsd/vm_group.xsd
share/doc/xsd/vm_group_pool.xsd
share/doc/xsd/vm_pool.xsd
share/doc/xsd/vmtemplate.xsd
share/doc/xsd/vmtemplate_pool.xsd
share/doc/xsd/vnet.xsd
share/doc/xsd/vnet_pool.xsd
share/doc/xsd/vntemplate.xsd
share/doc/xsd/vntemplate_pool.xsd
share/doc/xsd/vrouter.xsd
share/doc/xsd/vrouter_pool.xsd
share/doc/xsd/zone.xsd
share/doc/xsd/zone_pool.xsd"

CONTEXT_SHARE=$(find share/context/ -type f \( ! -iname "*.sh" ! -iname "SConstruct" \))

#-----------------------------------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion share/rubygems/generate
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ GEM_DESCRIPTION={
:cli => {
:name => 'opennebula-cli',
:files => [
# Needed for JSON and YAML outputs
['share/doc/xsd/*.xsd', '/share/schemas/xsd'],

['src/cli/one[a-z]*', '/bin', 'oneprovision'],
['src/cli/*.rb', '/lib'],
['src/cli/one_helper/*.rb', '/lib/one_helper'],
Expand All @@ -104,7 +107,8 @@ GEM_DESCRIPTION={
:summary => 'OpenNebula Command Line Interface',
:description => 'Commands used to talk to OpenNebula',
:dependencies => [
['opennebula', "= #{DEFAULTS[:version]}"]
['opennebula', "= #{DEFAULTS[:version]}"],
'activesupport'
]
}
}
Expand Down
Loading

0 comments on commit 6a86457

Please sign in to comment.