Add testgres.plugins to plugin

Author: vshepard

setup.py

@@ -26,17 +26,18 @@
 with open('README.md', 'r') as f:
     readme = f.read()
 
+
 setup(
     version='1.9.2',
     name='testgres',
-    packages=['testgres', 'testgres.operations', 'testgres.plugins.probackup', 'testgres.plugins.probackup.storage'],
+    packages=['testgres', 'testgres.operations'],
     description='Testing utility for PostgreSQL and its extensions',
     url='https://github.com/postgrespro/testgres',
     long_description=readme,
     long_description_content_type='text/markdown',
     license='PostgreSQL',
-    author='Ildar Musin',
-    author_email='[email protected]',
+    author='Postgres Professional',
+    author_email='[email protected]',
     keywords=['test', 'testing', 'postgresql'],
     install_requires=install_requires,
     classifiers=[],

testgres/__init__.py

@@ -51,11 +51,6 @@
 from .operations.os_ops import OsOperations, ConnectionParams
 from .operations.local_ops import LocalOperations
 from .operations.remote_ops import RemoteOperations
-from .plugins.probackup.gdb import GDBobj
-from .plugins.probackup.app import ProbackupApp
-from .plugins.probackup.app import ProbackupException
-from .plugins.probackup.init_helpers import init_params
-from .plugins.probackup.storage.fs_backup import FSTestBackupDir
 
 __all__ = [
     "get_new_node",
@@ -68,6 +63,5 @@
     "PostgresNode", "NodeApp",
     "reserve_port", "release_port", "bound_ports", "get_bin_path", "get_pg_config", "get_pg_version",
     "First", "Any",
-    "OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams",
-    "init_params", "FSTestBackupDir", "ProbackupException", "ProbackupApp", "GDBobj"
+    "OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams"
 ]

testgres/plugins/__init__.py

@@ -0,0 +1,9 @@
+from pg_probackup2.gdb import GDBobj
+from pg_probackup2.app import ProbackupApp, ProbackupException
+from pg_probackup2.init_helpers import init_params
+from pg_probackup2.storage.fs_backup import FSTestBackupDir
+
+
+__all__ = [
+        "ProbackupApp", "ProbackupException", "init_params", "FSTestBackupDir", "GDBobj"
+    ]

testgres/plugins/probackup/__init__.py renamed to testgres/plugins/pg_probackup2/__init__.py

@@ -4,7 +4,7 @@
 import os
 import shutil
 
-from testgres.plugins.probackup.init_helpers import init_params
+from ..init_helpers import init_params
 
 
 class TestBackupDir:

testgres/plugins/probackup/storage/__init__.py renamed to testgres/plugins/pg_probackup2/pg_probackup2/__init__.py

@@ -0,0 +1,18 @@
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+setup(
+    version='0.0.1',
+    name='testgres_pg_probackup2',
+    packages=['pg_probackup2', 'pg_probackup2.storage'],
+    description='Plugin for testgres that manages pg_probackup2',
+    url='https://github.com/postgrespro/testgres',
+    long_description_content_type='text/markdown',
+    license='PostgreSQL',
+    author='Postgres Professional',
+    author_email='[email protected]',
+    keywords=['pg_probackup', 'testing', 'testgres'],
+    install_requires=['testgres>=1.9.2']
+)

testgres/plugins/probackup/app.py renamed to testgres/plugins/pg_probackup2/pg_probackup2/app.py

@@ -52,10 +52,10 @@
 from testgres.utils import PgVer
 from testgres.node import ProcessProxy, ConnectionParams
 
-conn_params = ConnectionParams(host=os.getenv('RDBMS_TESTPOOL1_HOST') or '172.18.0.3',
-                               username='dev',
-                               ssh_key=os.getenv(
-                                   'RDBMS_TESTPOOL_SSHKEY') or '../../container_files/postgres/ssh/id_ed25519')
+conn_params = ConnectionParams(host=os.getenv('RDBMS_TESTPOOL1_HOST') or '172.18.0.2',
+                               username=os.getenv('RDBMS_TESTPOOL_USERNAME') or 'dev',
+                               ssh_key=os.getenv('RDBMS_TESTPOOL_SSHKEY') or
+                                       '/home/vika/Desktop/work/dev-ee-probackup/container_files/postgres/ssh/id_ed25519.pub')
 os_ops = RemoteOperations(conn_params)
 testgres_config.set_os_ops(os_ops=os_ops)