From ef0ccca30e7e9f32be97c4f12ff9c17c785f3314 Mon Sep 17 00:00:00 2001
From: Nate Rini <nate@schedmd.com>
Date: Thu, 1 Jul 2021 13:17:57 -0600
Subject: [PATCH] Move src/slurmrestd/plugin/openapi to src/plugins.
Will be used in other components, and not just in the slurmrestd.
Bug 11076
---
configure | 12 ++++++------
configure.ac | 10 +++++-----
src/plugins/Makefile.am | 1 +
src/plugins/Makefile.in | 1 +
src/{slurmrestd => }/plugins/openapi/Makefile.am | 0
src/{slurmrestd => }/plugins/openapi/Makefile.in | 6 +++---
.../plugins/openapi/dbv0.0.36/LICENSE-openapi.json | 0
.../plugins/openapi/dbv0.0.36/Makefile.am | 0
.../plugins/openapi/dbv0.0.36/Makefile.in | 6 +++---
.../plugins/openapi/dbv0.0.36/accounts.c | 2 +-
src/{slurmrestd => }/plugins/openapi/dbv0.0.36/api.c | 2 +-
src/{slurmrestd => }/plugins/openapi/dbv0.0.36/api.h | 2 +-
.../plugins/openapi/dbv0.0.36/associations.c | 2 +-
.../plugins/openapi/dbv0.0.36/cluster.c | 2 +-
.../plugins/openapi/dbv0.0.36/config.c | 2 +-
.../plugins/openapi/dbv0.0.36/diag.c | 2 +-
.../plugins/openapi/dbv0.0.36/jobs.c | 2 +-
.../plugins/openapi/dbv0.0.36/openapi.json | 0
.../plugins/openapi/dbv0.0.36/parse.c | 2 +-
.../plugins/openapi/dbv0.0.36/parse.h | 0
src/{slurmrestd => }/plugins/openapi/dbv0.0.36/qos.c | 2 +-
.../plugins/openapi/dbv0.0.36/tres.c | 2 +-
.../plugins/openapi/dbv0.0.36/users.c | 2 +-
.../plugins/openapi/dbv0.0.36/wckeys.c | 2 +-
.../plugins/openapi/v0.0.35/LICENSE-openapi.json | 0
.../plugins/openapi/v0.0.35/Makefile.am | 0
.../plugins/openapi/v0.0.35/Makefile.in | 6 +++---
src/{slurmrestd => }/plugins/openapi/v0.0.35/api.c | 0
src/{slurmrestd => }/plugins/openapi/v0.0.35/diag.c | 0
src/{slurmrestd => }/plugins/openapi/v0.0.35/jobs.c | 0
src/{slurmrestd => }/plugins/openapi/v0.0.35/nodes.c | 0
.../plugins/openapi/v0.0.35/openapi.json | 0
.../plugins/openapi/v0.0.35/partitions.c | 0
.../plugins/openapi/v0.0.36/LICENSE-openapi.json | 0
.../plugins/openapi/v0.0.36/Makefile.am | 0
.../plugins/openapi/v0.0.36/Makefile.in | 6 +++---
src/{slurmrestd => }/plugins/openapi/v0.0.36/api.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.36/api.h | 0
src/{slurmrestd => }/plugins/openapi/v0.0.36/diag.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.36/jobs.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.36/nodes.c | 2 +-
.../plugins/openapi/v0.0.36/openapi.json | 0
.../plugins/openapi/v0.0.36/partitions.c | 2 +-
.../plugins/openapi/v0.0.37/LICENSE-openapi.json | 0
.../plugins/openapi/v0.0.37/Makefile.am | 0
.../plugins/openapi/v0.0.37/Makefile.in | 6 +++---
src/{slurmrestd => }/plugins/openapi/v0.0.37/api.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.37/api.h | 0
src/{slurmrestd => }/plugins/openapi/v0.0.37/diag.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.37/jobs.c | 2 +-
src/{slurmrestd => }/plugins/openapi/v0.0.37/nodes.c | 2 +-
.../plugins/openapi/v0.0.37/openapi.json | 0
.../plugins/openapi/v0.0.37/partitions.c | 2 +-
.../plugins/openapi/v0.0.37/reservations.c | 2 +-
src/slurmrestd/plugins/Makefile.am | 2 +-
src/slurmrestd/plugins/Makefile.in | 4 ++--
56 files changed, 55 insertions(+), 53 deletions(-)
rename src/{slurmrestd => }/plugins/openapi/Makefile.am (100%)
rename src/{slurmrestd => }/plugins/openapi/Makefile.in (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/LICENSE-openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/Makefile.am (100%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/Makefile.in (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/accounts.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/api.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/api.h (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/associations.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/cluster.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/config.c (98%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/diag.c (98%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/jobs.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/parse.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/parse.h (100%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/qos.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/tres.c (98%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/users.c (99%)
rename src/{slurmrestd => }/plugins/openapi/dbv0.0.36/wckeys.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/LICENSE-openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/Makefile.am (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/Makefile.in (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/api.c (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/diag.c (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/jobs.c (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/nodes.c (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.35/partitions.c (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/LICENSE-openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/Makefile.am (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/Makefile.in (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/api.c (98%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/api.h (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/diag.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/jobs.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/nodes.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.36/partitions.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/LICENSE-openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/Makefile.am (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/Makefile.in (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/api.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/api.h (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/diag.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/jobs.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/nodes.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/openapi.json (100%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/partitions.c (99%)
rename src/{slurmrestd => }/plugins/openapi/v0.0.37/reservations.c (99%)
diff --git a/configure b/configure
index 9b5ffe6125f..d4c02a9d7a5 100755
--- a/configure
+++ b/configure
@@ -25169,7 +25169,7 @@ $as_echo "${x_ac_deprecated=no}" >&6; }
-ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/lua/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/plugins/openapi/v0.0.35/Makefile src/slurmrestd/plugins/openapi/v0.0.36/Makefile src/slurmrestd/plugins/openapi/v0.0.37/Makefile src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/rsmi/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/none/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_common/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile"
+ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/lua/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/rsmi/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/none/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/openapi/Makefile src/plugins/openapi/v0.0.35/Makefile src/plugins/openapi/v0.0.36/Makefile src/plugins/openapi/v0.0.37/Makefile src/plugins/openapi/dbv0.0.36/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_common/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile"
cat >confcache <<\_ACEOF
@@ -26502,11 +26502,6 @@ do
"src/slurmrestd/plugins/auth/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/Makefile" ;;
"src/slurmrestd/plugins/auth/jwt/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/jwt/Makefile" ;;
"src/slurmrestd/plugins/auth/local/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/local/Makefile" ;;
- "src/slurmrestd/plugins/openapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.35/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.35/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.36/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.37/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.37/Makefile" ;;
- "src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile" ;;
"src/sprio/Makefile") CONFIG_FILES="$CONFIG_FILES src/sprio/Makefile" ;;
"src/squeue/Makefile") CONFIG_FILES="$CONFIG_FILES src/squeue/Makefile" ;;
"src/srun/Makefile") CONFIG_FILES="$CONFIG_FILES src/srun/Makefile" ;;
@@ -26611,6 +26606,11 @@ do
"src/plugins/node_features/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/Makefile" ;;
"src/plugins/node_features/knl_cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/knl_cray/Makefile" ;;
"src/plugins/node_features/knl_generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/knl_generic/Makefile" ;;
+ "src/plugins/openapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/Makefile" ;;
+ "src/plugins/openapi/v0.0.35/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.35/Makefile" ;;
+ "src/plugins/openapi/v0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.36/Makefile" ;;
+ "src/plugins/openapi/v0.0.37/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.37/Makefile" ;;
+ "src/plugins/openapi/dbv0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/dbv0.0.36/Makefile" ;;
"src/plugins/power/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/Makefile" ;;
"src/plugins/power/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/common/Makefile" ;;
"src/plugins/power/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/cray_aries/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d0036023d55..3b9b0b45812 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,11 +448,6 @@ AC_CONFIG_FILES([Makefile
src/slurmrestd/plugins/auth/Makefile
src/slurmrestd/plugins/auth/jwt/Makefile
src/slurmrestd/plugins/auth/local/Makefile
- src/slurmrestd/plugins/openapi/Makefile
- src/slurmrestd/plugins/openapi/v0.0.35/Makefile
- src/slurmrestd/plugins/openapi/v0.0.36/Makefile
- src/slurmrestd/plugins/openapi/v0.0.37/Makefile
- src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile
src/sprio/Makefile
src/squeue/Makefile
src/srun/Makefile
@@ -557,6 +552,11 @@ AC_CONFIG_FILES([Makefile
src/plugins/node_features/Makefile
src/plugins/node_features/knl_cray/Makefile
src/plugins/node_features/knl_generic/Makefile
+ src/plugins/openapi/Makefile
+ src/plugins/openapi/v0.0.35/Makefile
+ src/plugins/openapi/v0.0.36/Makefile
+ src/plugins/openapi/v0.0.37/Makefile
+ src/plugins/openapi/dbv0.0.36/Makefile
src/plugins/power/Makefile
src/plugins/power/common/Makefile
src/plugins/power/cray_aries/Makefile
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f50414893a5..322c7d44776 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS = \
mcs \
mpi \
node_features \
+ openapi \
power \
preempt \
prep \
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 4593996cc94..43cdc9c473d 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -472,6 +472,7 @@ SUBDIRS = \
mcs \
mpi \
node_features \
+ openapi \
power \
preempt \
prep \
diff --git a/src/slurmrestd/plugins/openapi/Makefile.am b/src/plugins/openapi/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/Makefile.am
rename to src/plugins/openapi/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/Makefile.in b/src/plugins/openapi/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/Makefile.in
rename to src/plugins/openapi/Makefile.in
index 0f037005781..1ee4d11d550 100644
--- a/src/slurmrestd/plugins/openapi/Makefile.in
+++ b/src/plugins/openapi/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi
+subdir = src/plugins/openapi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -462,9 +462,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/slurmrestd/plugins/openapi/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/openapi/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/slurmrestd/plugins/openapi/Makefile
+ $(AUTOMAKE) --gnu src/plugins/openapi/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/LICENSE-openapi.json b/src/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
rename to src/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.am b/src/plugins/openapi/dbv0.0.36/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.am
rename to src/plugins/openapi/dbv0.0.36/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in b/src/plugins/openapi/dbv0.0.36/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in
rename to src/plugins/openapi/dbv0.0.36/Makefile.in
index 8254e6a0e85..afde820be9d 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in
+++ b/src/plugins/openapi/dbv0.0.36/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/dbv0.0.36
+subdir = src/plugins/openapi/dbv0.0.36
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -540,9 +540,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/dbv0.0.36/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/dbv0.0.36/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c b/src/plugins/openapi/dbv0.0.36/accounts.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c
rename to src/plugins/openapi/dbv0.0.36/accounts.c
index a5a40eee703..fa653d640a5 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c
+++ b/src/plugins/openapi/dbv0.0.36/accounts.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_ACCOUNT 0xaefefef0
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.c b/src/plugins/openapi/dbv0.0.36/api.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/api.c
rename to src/plugins/openapi/dbv0.0.36/api.c
index ae899c8e47b..12694ab527d 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.c
+++ b/src/plugins/openapi/dbv0.0.36/api.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.h b/src/plugins/openapi/dbv0.0.36/api.h
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/api.h
rename to src/plugins/openapi/dbv0.0.36/api.h
index d5b58636f11..8084cdeb107 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.h
+++ b/src/plugins/openapi/dbv0.0.36/api.h
@@ -46,7 +46,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h"
+#include "src/plugins/openapi/dbv0.0.36/parse.h"
#define CONFIG_OP_TAG 0xfffffffe
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c b/src/plugins/openapi/dbv0.0.36/associations.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c
rename to src/plugins/openapi/dbv0.0.36/associations.c
index e05697ff159..091f592ee92 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c
+++ b/src/plugins/openapi/dbv0.0.36/associations.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static int _foreach_delete_assoc(void *x, void *arg)
{
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c b/src/plugins/openapi/dbv0.0.36/cluster.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c
rename to src/plugins/openapi/dbv0.0.36/cluster.c
index 113a22812d0..f142b9b18ae 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c
+++ b/src/plugins/openapi/dbv0.0.36/cluster.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_CLUSTER 0x2aa2faf2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/config.c b/src/plugins/openapi/dbv0.0.36/config.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/config.c
rename to src/plugins/openapi/dbv0.0.36/config.c
index 9fe4fd4e745..434e0bd4108 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/config.c
+++ b/src/plugins/openapi/dbv0.0.36/config.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static const operation_handler_t ops[] = {
/* Warning: order matters */
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c b/src/plugins/openapi/dbv0.0.36/diag.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c
rename to src/plugins/openapi/dbv0.0.36/diag.c
index 4c4aeb7bd8e..2b988817a50 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c
+++ b/src/plugins/openapi/dbv0.0.36/diag.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/* based on sacctmgr_list_stats() */
static int _op_handler_diag(const char *context_id,
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c b/src/plugins/openapi/dbv0.0.36/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c
rename to src/plugins/openapi/dbv0.0.36/jobs.c
index 63c9a633762..4e2a8b553ae 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c
+++ b/src/plugins/openapi/dbv0.0.36/jobs.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_JOB 0xf8aefef3
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/openapi.json b/src/plugins/openapi/dbv0.0.36/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/openapi.json
rename to src/plugins/openapi/dbv0.0.36/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c b/src/plugins/openapi/dbv0.0.36/parse.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c
rename to src/plugins/openapi/dbv0.0.36/parse.c
index cd69676b5ca..dc6869927fd 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c
+++ b/src/plugins/openapi/dbv0.0.36/parse.c
@@ -52,7 +52,7 @@
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/*
* WARNING: parser uses a ton of macros to avoid massive amounts of copy and
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h b/src/plugins/openapi/dbv0.0.36/parse.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h
rename to src/plugins/openapi/dbv0.0.36/parse.h
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c b/src/plugins/openapi/dbv0.0.36/qos.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c
rename to src/plugins/openapi/dbv0.0.36/qos.c
index af5fdafc189..72320fc38d2 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c
+++ b/src/plugins/openapi/dbv0.0.36/qos.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
enum {
TAG_ALL_QOS = 0,
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c b/src/plugins/openapi/dbv0.0.36/tres.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c
rename to src/plugins/openapi/dbv0.0.36/tres.c
index 8fd1e200044..8460f2e3d26 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c
+++ b/src/plugins/openapi/dbv0.0.36/tres.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static int _foreach_dump_tres(void *x, void *arg)
{
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/users.c b/src/plugins/openapi/dbv0.0.36/users.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/users.c
rename to src/plugins/openapi/dbv0.0.36/users.c
index 6516b46766e..16b946bbf8f 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/users.c
+++ b/src/plugins/openapi/dbv0.0.36/users.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_USER 0xa13efef2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c b/src/plugins/openapi/dbv0.0.36/wckeys.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c
rename to src/plugins/openapi/dbv0.0.36/wckeys.c
index 2eb19cff006..ee45d7cf44f 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c
+++ b/src/plugins/openapi/dbv0.0.36/wckeys.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_WCKEY 0xb3a2faf2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/LICENSE-openapi.json b/src/plugins/openapi/v0.0.35/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.35/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.am b/src/plugins/openapi/v0.0.35/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/Makefile.am
rename to src/plugins/openapi/v0.0.35/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in b/src/plugins/openapi/v0.0.35/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in
rename to src/plugins/openapi/v0.0.35/Makefile.in
index 14d16336942..2db5584b4fb 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in
+++ b/src/plugins/openapi/v0.0.35/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.35
+subdir = src/plugins/openapi/v0.0.35
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.35/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.35/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.35/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.35/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/api.c b/src/plugins/openapi/v0.0.35/api.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/api.c
rename to src/plugins/openapi/v0.0.35/api.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/diag.c b/src/plugins/openapi/v0.0.35/diag.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/diag.c
rename to src/plugins/openapi/v0.0.35/diag.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/jobs.c b/src/plugins/openapi/v0.0.35/jobs.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/jobs.c
rename to src/plugins/openapi/v0.0.35/jobs.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/nodes.c b/src/plugins/openapi/v0.0.35/nodes.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/nodes.c
rename to src/plugins/openapi/v0.0.35/nodes.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/openapi.json b/src/plugins/openapi/v0.0.35/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/openapi.json
rename to src/plugins/openapi/v0.0.35/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/partitions.c b/src/plugins/openapi/v0.0.35/partitions.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/partitions.c
rename to src/plugins/openapi/v0.0.35/partitions.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/LICENSE-openapi.json b/src/plugins/openapi/v0.0.36/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.36/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.am b/src/plugins/openapi/v0.0.36/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/Makefile.am
rename to src/plugins/openapi/v0.0.36/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in b/src/plugins/openapi/v0.0.36/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in
rename to src/plugins/openapi/v0.0.36/Makefile.in
index 18eb83745e5..bc935b17663 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in
+++ b/src/plugins/openapi/v0.0.36/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.36
+subdir = src/plugins/openapi/v0.0.36
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.36/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.36/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.36/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.36/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/api.c b/src/plugins/openapi/v0.0.36/api.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/v0.0.36/api.c
rename to src/plugins/openapi/v0.0.36/api.c
index ec7b3ac9c51..54531bde422 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/api.c
+++ b/src/plugins/openapi/v0.0.36/api.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/api.h b/src/plugins/openapi/v0.0.36/api.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/api.h
rename to src/plugins/openapi/v0.0.36/api.h
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/diag.c b/src/plugins/openapi/v0.0.36/diag.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/diag.c
rename to src/plugins/openapi/v0.0.36/diag.c
index 6fae3239492..d63f4570f71 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/diag.c
+++ b/src/plugins/openapi/v0.0.36/diag.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/jobs.c b/src/plugins/openapi/v0.0.36/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/jobs.c
rename to src/plugins/openapi/v0.0.36/jobs.c
index 2b29cc32582..66788d291db 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/jobs.c
+++ b/src/plugins/openapi/v0.0.36/jobs.c
@@ -66,7 +66,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef struct {
const char *param;
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/nodes.c b/src/plugins/openapi/v0.0.36/nodes.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/nodes.c
rename to src/plugins/openapi/v0.0.36/nodes.c
index daf0097b139..bc5486b97ac 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/nodes.c
+++ b/src/plugins/openapi/v0.0.36/nodes.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/openapi.json b/src/plugins/openapi/v0.0.36/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/openapi.json
rename to src/plugins/openapi/v0.0.36/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/partitions.c b/src/plugins/openapi/v0.0.36/partitions.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/partitions.c
rename to src/plugins/openapi/v0.0.36/partitions.c
index b035851fb2e..c6f55424aad 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/partitions.c
+++ b/src/plugins/openapi/v0.0.36/partitions.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/LICENSE-openapi.json b/src/plugins/openapi/v0.0.37/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.37/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.am b/src/plugins/openapi/v0.0.37/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/Makefile.am
rename to src/plugins/openapi/v0.0.37/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in b/src/plugins/openapi/v0.0.37/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in
rename to src/plugins/openapi/v0.0.37/Makefile.in
index 82417463584..eead6f7b585 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in
+++ b/src/plugins/openapi/v0.0.37/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.37
+subdir = src/plugins/openapi/v0.0.37
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.37/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.37/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.37/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.37/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/api.c b/src/plugins/openapi/v0.0.37/api.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/api.c
rename to src/plugins/openapi/v0.0.37/api.c
index 5c8169f24ce..4a525f584b9 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/api.c
+++ b/src/plugins/openapi/v0.0.37/api.c
@@ -51,7 +51,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/api.h b/src/plugins/openapi/v0.0.37/api.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/api.h
rename to src/plugins/openapi/v0.0.37/api.h
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/diag.c b/src/plugins/openapi/v0.0.37/diag.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/diag.c
rename to src/plugins/openapi/v0.0.37/diag.c
index 8fbffd7c0ee..63c54d85626 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/diag.c
+++ b/src/plugins/openapi/v0.0.37/diag.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/jobs.c b/src/plugins/openapi/v0.0.37/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/jobs.c
rename to src/plugins/openapi/v0.0.37/jobs.c
index bb24a139c3e..f460829ad95 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/jobs.c
+++ b/src/plugins/openapi/v0.0.37/jobs.c
@@ -66,7 +66,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef struct {
const char *param;
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/nodes.c b/src/plugins/openapi/v0.0.37/nodes.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/nodes.c
rename to src/plugins/openapi/v0.0.37/nodes.c
index 4c6822980fb..8177991dfbb 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/nodes.c
+++ b/src/plugins/openapi/v0.0.37/nodes.c
@@ -55,7 +55,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/openapi.json b/src/plugins/openapi/v0.0.37/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/openapi.json
rename to src/plugins/openapi/v0.0.37/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/partitions.c b/src/plugins/openapi/v0.0.37/partitions.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/partitions.c
rename to src/plugins/openapi/v0.0.37/partitions.c
index 6e5202b14bd..3eaa4f6fb1a 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/partitions.c
+++ b/src/plugins/openapi/v0.0.37/partitions.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/reservations.c b/src/plugins/openapi/v0.0.37/reservations.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/reservations.c
rename to src/plugins/openapi/v0.0.37/reservations.c
index 5d8fab86f15..a33e127705e 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/reservations.c
+++ b/src/plugins/openapi/v0.0.37/reservations.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/Makefile.am b/src/slurmrestd/plugins/Makefile.am
index fcbac0cd001..5937cbb3b34 100644
--- a/src/slurmrestd/plugins/Makefile.am
+++ b/src/slurmrestd/plugins/Makefile.am
@@ -1,3 +1,3 @@
if WITH_SLURMRESTD
-SUBDIRS = openapi auth
+SUBDIRS = auth
endif
diff --git a/src/slurmrestd/plugins/Makefile.in b/src/slurmrestd/plugins/Makefile.in
index 8f60911296e..bc261cfa5e2 100644
--- a/src/slurmrestd/plugins/Makefile.in
+++ b/src/slurmrestd/plugins/Makefile.in
@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = openapi auth
+DIST_SUBDIRS = auth
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -449,7 +449,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@WITH_SLURMRESTD_TRUE@SUBDIRS = openapi auth
+@WITH_SLURMRESTD_TRUE@SUBDIRS = auth
all: all-recursive
.SUFFIXES:
--
GitLab