diff --git a/README.rst b/README.rst index b146402aa3..ec113d4dca 100644 --- a/README.rst +++ b/README.rst @@ -91,14 +91,13 @@ tests should still pass, but a very large number will be skipped. Code Organization ~~~~~~~~~~~~~~~~~ -- bin/: Executable scripts that are the processes run by the deployer - doc/: Documentation - etc/: Sample config files - examples/: Config snippets used in the docs - swift/: Core code - account/: account server - - cli/: code that backs some of the CLI tools in bin/ + - cli/: code that backs some of the CLI tools - common/: code shared by different modules - middleware/: "standard", officially-supported middleware diff --git a/bin/swift-account-audit b/bin/swift-account-audit deleted file mode 100755 index 9d5d80a677..0000000000 --- a/bin/swift-account-audit +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import account_audit - -if __name__ == "__main__": - account_audit.main() diff --git a/bin/swift-account-auditor b/bin/swift-account-auditor deleted file mode 100755 index 4581c5052b..0000000000 --- a/bin/swift-account-auditor +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.account import auditor - -if __name__ == '__main__': - auditor.main() diff --git a/bin/swift-account-info b/bin/swift-account-info deleted file mode 100755 index 54bde7b70a..0000000000 --- a/bin/swift-account-info +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy -# of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from swift.cli import info - -if __name__ == '__main__': - info.account_main() diff --git a/bin/swift-account-reaper b/bin/swift-account-reaper deleted file mode 100755 index 3ea731bfbd..0000000000 --- a/bin/swift-account-reaper +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.account import reaper - -if __name__ == '__main__': - reaper.main() diff --git a/bin/swift-account-replicator b/bin/swift-account-replicator deleted file mode 100755 index 9f500f0bb8..0000000000 --- a/bin/swift-account-replicator +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.account import replicator - -if __name__ == '__main__': - replicator.main() diff --git a/bin/swift-account-server b/bin/swift-account-server deleted file mode 100755 index 729d973fae..0000000000 --- a/bin/swift-account-server +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.account import server - -if __name__ == '__main__': - server.main() diff --git a/bin/swift-config b/bin/swift-config deleted file mode 100755 index a8515ac486..0000000000 --- a/bin/swift-config +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import config - -if __name__ == "__main__": - config.main() diff --git a/bin/swift-container-auditor b/bin/swift-container-auditor deleted file mode 100755 index a56911f24e..0000000000 --- a/bin/swift-container-auditor +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import auditor - -if __name__ == '__main__': - auditor.main() diff --git a/bin/swift-container-info b/bin/swift-container-info deleted file mode 100755 index 362d0ab3e5..0000000000 --- a/bin/swift-container-info +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy -# of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from swift.cli import info - -if __name__ == '__main__': - info.container_main() diff --git a/bin/swift-container-reconciler b/bin/swift-container-reconciler deleted file mode 100755 index 194936fdbc..0000000000 --- a/bin/swift-container-reconciler +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import reconciler - -if __name__ == '__main__': - reconciler.main() diff --git a/bin/swift-container-replicator b/bin/swift-container-replicator deleted file mode 100755 index bd08307bb1..0000000000 --- a/bin/swift-container-replicator +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import replicator - -if __name__ == '__main__': - replicator.main() diff --git a/bin/swift-container-server b/bin/swift-container-server deleted file mode 100755 index 5f2c3e6a97..0000000000 --- a/bin/swift-container-server +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import server - -if __name__ == '__main__': - server.main() diff --git a/bin/swift-container-sharder b/bin/swift-container-sharder deleted file mode 100755 index ce59e338d0..0000000000 --- a/bin/swift-container-sharder +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2015 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import sharder - -if __name__ == '__main__': - sharder.main() diff --git a/bin/swift-container-sync b/bin/swift-container-sync deleted file mode 100755 index 38acac881e..0000000000 --- a/bin/swift-container-sync +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import sync - -if __name__ == '__main__': - sync.main() diff --git a/bin/swift-container-updater b/bin/swift-container-updater deleted file mode 100755 index 11fb11fde7..0000000000 --- a/bin/swift-container-updater +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.container import updater - -if __name__ == '__main__': - updater.main() diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate deleted file mode 100755 index 73886e604f..0000000000 --- a/bin/swift-dispersion-populate +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. -from swift.cli import dispersion_populate - -if __name__ == '__main__': - dispersion_populate.main() diff --git a/bin/swift-dispersion-report b/bin/swift-dispersion-report deleted file mode 100755 index f49b3034f4..0000000000 --- a/bin/swift-dispersion-report +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2017 Christian Schwede -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -import sys - -from swift.cli.dispersion_report import main - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/bin/swift-drive-audit b/bin/swift-drive-audit deleted file mode 100755 index 1316bdd393..0000000000 --- a/bin/swift-drive-audit +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import drive_audit - -if __name__ == "__main__": - drive_audit.main() diff --git a/bin/swift-form-signature b/bin/swift-form-signature deleted file mode 100755 index 15a0777912..0000000000 --- a/bin/swift-form-signature +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys -import swift.cli.form_signature - - -if __name__ == "__main__": - sys.exit(swift.cli.form_signature.main(sys.argv)) diff --git a/bin/swift-get-nodes b/bin/swift-get-nodes deleted file mode 100755 index a9f5f277ba..0000000000 --- a/bin/swift-get-nodes +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import get_nodes - -if __name__ == "__main__": - get_nodes.main() diff --git a/bin/swift-init b/bin/swift-init deleted file mode 100755 index f2000b26e6..0000000000 --- a/bin/swift-init +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys -from swift.common import manager - -if __name__ == '__main__': - sys.exit(manager.main()) diff --git a/bin/swift-object-auditor b/bin/swift-object-auditor deleted file mode 100755 index dc56d53ae6..0000000000 --- a/bin/swift-object-auditor +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import auditor - -if __name__ == '__main__': - auditor.main() diff --git a/bin/swift-object-expirer b/bin/swift-object-expirer deleted file mode 100755 index 735af596ac..0000000000 --- a/bin/swift-object-expirer +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import expirer - -if __name__ == '__main__': - expirer.main() diff --git a/bin/swift-object-info b/bin/swift-object-info deleted file mode 100755 index b43cedc898..0000000000 --- a/bin/swift-object-info +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import info - -if __name__ == '__main__': - info.obj_main() diff --git a/bin/swift-object-reconstructor b/bin/swift-object-reconstructor deleted file mode 100755 index 9271e62e5b..0000000000 --- a/bin/swift-object-reconstructor +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import reconstructor - -if __name__ == '__main__': - reconstructor.main() diff --git a/bin/swift-object-relinker b/bin/swift-object-relinker deleted file mode 100755 index 5457c93f65..0000000000 --- a/bin/swift-object-relinker +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -import sys - -from swift.cli.relinker import main - -if __name__ == '__main__': - sys.exit(main()) diff --git a/bin/swift-object-replicator b/bin/swift-object-replicator deleted file mode 100755 index 99a8afd1b0..0000000000 --- a/bin/swift-object-replicator +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import replicator - -if __name__ == '__main__': - replicator.main() diff --git a/bin/swift-object-server b/bin/swift-object-server deleted file mode 100755 index 6f968a0b50..0000000000 --- a/bin/swift-object-server +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import server - - -if __name__ == '__main__': - server.main() diff --git a/bin/swift-object-updater b/bin/swift-object-updater deleted file mode 100755 index 3294d9d0f1..0000000000 --- a/bin/swift-object-updater +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.obj import updater - -if __name__ == '__main__': - updater.main() diff --git a/bin/swift-oldies b/bin/swift-oldies deleted file mode 100755 index c9231d77bb..0000000000 --- a/bin/swift-oldies +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import oldies - -if __name__ == '__main__': - oldies.main() diff --git a/bin/swift-orphans b/bin/swift-orphans deleted file mode 100755 index 492ba7ecd2..0000000000 --- a/bin/swift-orphans +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli import orphans - -if __name__ == '__main__': - orphans.main() diff --git a/bin/swift-proxy-server b/bin/swift-proxy-server deleted file mode 100755 index 1a11eb70a1..0000000000 --- a/bin/swift-proxy-server +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2010-2012 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.proxy import server - -if __name__ == '__main__': - server.main() diff --git a/bin/swift-recon b/bin/swift-recon deleted file mode 100755 index 72f6eeef41..0000000000 --- a/bin/swift-recon +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2014 Christian Schwede -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -import sys - -from swift.cli.recon import main - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/bin/swift-recon-cron b/bin/swift-recon-cron deleted file mode 100755 index cdb0fd95ed..0000000000 --- a/bin/swift-recon-cron +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" -swift-recon-cron.py -""" - -import sys - -from swift.cli.recon_cron import main - -if __name__ == '__main__': - sys.exit(main()) diff --git a/bin/swift-reconciler-enqueue b/bin/swift-reconciler-enqueue deleted file mode 100755 index 34a187cd55..0000000000 --- a/bin/swift-reconciler-enqueue +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. -from swift.cli import reconciler_enqueue - -if __name__ == "__main__": - reconciler_enqueue.main() diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder deleted file mode 100755 index 9b38415787..0000000000 --- a/bin/swift-ring-builder +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2014 Christian Schwede -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from swift.cli.ringbuilder import error_handling_main - -if __name__ == "__main__": - error_handling_main() diff --git a/bin/swift-ring-builder-analyzer b/bin/swift-ring-builder-analyzer deleted file mode 100755 index 6a70105c14..0000000000 --- a/bin/swift-ring-builder-analyzer +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2015 Samuel Merritt -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import sys -from swift.cli.ring_builder_analyzer import main - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/bin/swift-ring-composer b/bin/swift-ring-composer deleted file mode 100755 index fccc9016c8..0000000000 --- a/bin/swift-ring-composer +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2017 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. -import sys - -from swift.cli.ringcomposer import main - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/tox.ini b/tox.ini index 3038cd1a91..f9732fe81c 100644 --- a/tox.ini +++ b/tox.ini @@ -59,7 +59,6 @@ allowlist_externals = ./.manpages commands = flake8 {posargs:swift test doc setup.py} - flake8 --filename=bin/swift* bin python ./setup.py check --restructuredtext --strict bandit -c bandit.yaml -r swift -n 5 ./.manpages {posargs} @@ -161,7 +160,7 @@ commands = bandit -c bandit.yaml -r swift -n 5 # W504: line break after binary operator ignore = H101,H202,H214,H216,H301,H306,H404,H405,H501,W503,W504,E402,E731,E741 exclude = .venv,.tox,dist,*egg -filename = *.py,bin/* +filename = *.py show-source = True [testenv:bindep]