diff --git a/.gitignore b/.gitignore index f274a24f..7a33b0c0 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,7 @@ venv.bak/ .DS_Store *.wgn +fusion-agent +fusion-common +fusion-manager +cloudify-utilities-plugins-sdk diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 62db4911..4ab7a1b8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +3.3.7: update requirements.txt. 3.3.6: Support Python 3.11 and discontinue 3.6. 3.3.5: add extra_specs and tenant access to flavor type. 3.3.4: support dsl 1_4 and redhat 8 wagons. diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..5f789385 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +download: +ifeq (,$(wildcard ./fusion-agent)) + git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd .. +endif +ifeq (,$(wildcard ./fusion-common)) + git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd .. +endif +ifeq (,$(wildcard ./fusion-manager)) + git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd .. +endif +ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk)) + git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd .. +endif diff --git a/constraints.txt b/constraints.txt deleted file mode 100644 index bd4ff4da..00000000 --- a/constraints.txt +++ /dev/null @@ -1,3 +0,0 @@ -dogpile.cache===0.9.2 -cloudify-common>=5.1.0 -cryptography==3.3.2 diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/openstack_plugin/__version__.py b/openstack_plugin/__version__.py index b090d5f5..291065b7 100644 --- a/openstack_plugin/__version__.py +++ b/openstack_plugin/__version__.py @@ -1 +1 @@ -version = '3.3.6' +version = '3.3.7' diff --git a/openstack_plugin/resources/share/file_share.py b/openstack_plugin/resources/share/file_share.py index 8b6ea9c4..98412dfc 100644 --- a/openstack_plugin/resources/share/file_share.py +++ b/openstack_plugin/resources/share/file_share.py @@ -81,7 +81,7 @@ def delete(openstack_resource): openstack_resource.resource_id)) else: raise OperationRetry( - 'Shared resource {0} is still being deleted. Status: {0}'.format( + 'Shared resource {0} is still being deleted. Status: {1}'.format( openstack_resource.resource_id, openstack_resource.resource.status)) diff --git a/plugin.yaml b/plugin.yaml index b068e396..02431d32 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -3,7 +3,7 @@ plugins: openstack: executor: central_deployment_agent package_name: cloudify-openstack-plugin - package_version: 3.3.6 + package_version: 3.3.7 dsl_definitions: diff --git a/plugin_1_4.yaml b/plugin_1_4.yaml index 90168b48..2966b5c8 100644 --- a/plugin_1_4.yaml +++ b/plugin_1_4.yaml @@ -3,7 +3,7 @@ plugins: openstack: executor: central_deployment_agent package_name: cloudify-openstack-plugin - package_version: 3.3.6 + package_version: 3.3.7 dsl_definitions: diff --git a/plugin_1_5.yaml b/plugin_1_5.yaml index 90168b48..2966b5c8 100644 --- a/plugin_1_5.yaml +++ b/plugin_1_5.yaml @@ -3,7 +3,7 @@ plugins: openstack: executor: central_deployment_agent package_name: cloudify-openstack-plugin - package_version: 3.3.6 + package_version: 3.3.7 dsl_definitions: diff --git a/requirements-3.6.in b/requirements-3.6.in new file mode 100644 index 00000000..cf0357aa --- /dev/null +++ b/requirements-3.6.in @@ -0,0 +1,2 @@ +dogpile.cache===0.9.2 +cryptography==40.0.2 diff --git a/requirements-3.6.txt b/requirements-3.6.txt new file mode 100644 index 00000000..ba46b1f3 --- /dev/null +++ b/requirements-3.6.txt @@ -0,0 +1,401 @@ +# +# This file is autogenerated by pip-compile with python 3.6 +# To update, run: +# +# pip-compile --no-emit-index-url --output-file=requirements-3.6.txt requirements-3.6.in setup.py +# +adal==1.2.7 + # via msrestazure +aiohttp==3.7.4.post0 + # via cloudify-common +appdirs==1.4.4 + # via openstacksdk +async-timeout==3.0.1 + # via aiohttp +attrs==22.2.0 + # via + # aiohttp + # cmd2 +autopage==0.5.2 + # via cliff +azure-common==1.1.28 + # via azure-mgmt-containerservice +azure-core==1.24.2 + # via + # azure-identity + # azure-mgmt-core + # msrest +azure-identity==1.10.0 + # via cloudify-utilities-plugins-sdk +azure-mgmt-containerservice==17.0.0 + # via cloudify-utilities-plugins-sdk +azure-mgmt-core==1.3.2 + # via azure-mgmt-containerservice +babel==2.11.0 + # via python-manilaclient +bcrypt==4.0.1 + # via paramiko +boto3==1.23.10 + # via cloudify-utilities-plugins-sdk +botocore==1.26.10 + # via + # boto3 + # s3transfer +bottle==0.12.19 + # via cloudify-common +cachetools==4.2.4 + # via google-auth +certifi==2023.11.17 + # via + # kubernetes + # msrest + # requests +cffi==1.15.1 + # via + # cryptography + # pynacl +chardet==4.0.0 + # via aiohttp +charset-normalizer==2.0.12 + # via requests +cliff==3.10.1 + # via osc-lib +cloudify-common==6.4.2.0 + # via + # cloudify-openstack-plugin (setup.py) + # cloudify-utilities-plugins-sdk +cloudify-utilities-plugins-sdk==0.0.130 + # via cloudify-openstack-plugin (setup.py) +cmd2==2.4.3 + # via cliff +cryptography==40.0.2 + # via + # -r requirements-3.6.in + # adal + # azure-identity + # msal + # openstacksdk + # paramiko + # pyjwt +debtcollector==2.5.0 + # via + # oslo.config + # oslo.context + # oslo.log + # oslo.utils + # python-keystoneclient + # python-manilaclient +decorator==5.1.1 + # via + # dogpile.cache + # openstacksdk +dogpile.cache===0.9.2 + # via + # -r requirements-3.6.in + # openstacksdk +fasteners==0.17.3 + # via cloudify-common +gitdb==4.0.8 + # via + # cloudify-utilities-plugins-sdk + # gitpython +gitpython==3.1.18 + # via cloudify-utilities-plugins-sdk +google-auth==2.15.0 + # via + # cloudify-utilities-plugins-sdk + # kubernetes +idna==3.6 + # via + # idna-ssl + # requests + # yarl +idna-ssl==1.1.0 + # via aiohttp +importlib-metadata==4.8.3 + # via + # cmd2 + # debtcollector + # munch + # openstacksdk + # oslo.config + # python-keystoneclient + # stevedore +importlib-resources==5.4.0 + # via netaddr +ipy==0.81 + # via cloudify-openstack-plugin (setup.py) +iso8601==1.1.0 + # via + # keystoneauth1 + # openstacksdk + # oslo.utils +isodate==0.6.1 + # via msrest +jinja2==2.11.3 + # via + # cloudify-common + # cloudify-utilities-plugins-sdk +jmespath==0.10.0 + # via + # boto3 + # botocore + # openstacksdk +jsonpatch==1.32 + # via openstacksdk +jsonpointer==2.3 + # via jsonpatch +keystoneauth1==5.1.2 + # via + # openstacksdk + # osc-lib + # python-keystoneclient +kubernetes==v26.1.0 + # via cloudify-utilities-plugins-sdk +markupsafe==2.0.1 + # via jinja2 +msal==1.25.0 + # via + # azure-identity + # msal-extensions +msal-extensions==1.0.0 + # via azure-identity +msgpack==1.0.5 + # via oslo.serialization +msrest==0.7.1 + # via + # azure-mgmt-containerservice + # msrestazure +msrestazure==0.6.4 + # via cloudify-utilities-plugins-sdk +multidict==5.2.0 + # via + # aiohttp + # yarl +munch==4.0.0 + # via openstacksdk +netaddr==0.9.0 + # via + # oslo.config + # oslo.utils +netifaces==0.11.0 + # via + # openstacksdk + # oslo.utils +oauthlib==3.2.2 + # via requests-oauthlib +openstacksdk==0.53.0 + # via + # cloudify-openstack-plugin (setup.py) + # osc-lib +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +osc-lib==2.9.0 + # via python-manilaclient +oslo.config==8.8.1 + # via + # oslo.log + # python-keystoneclient + # python-manilaclient +oslo.context==4.1.0 + # via oslo.log +oslo.i18n==5.1.0 + # via + # osc-lib + # oslo.config + # oslo.log + # oslo.utils + # python-keystoneclient +oslo.log==4.8.0 + # via python-manilaclient +oslo.serialization==4.3.0 + # via + # oslo.log + # python-keystoneclient + # python-manilaclient +oslo.utils==4.13.0 + # via + # osc-lib + # oslo.log + # oslo.serialization + # python-keystoneclient + # python-manilaclient +packaging==21.3 + # via + # cloudify-utilities-plugins-sdk + # oslo.utils + # python-keystoneclient +paramiko==3.3.1 + # via cloudify-utilities-plugins-sdk +pbr==6.0.0 + # via + # cliff + # keystoneauth1 + # openstacksdk + # os-service-types + # osc-lib + # oslo.context + # oslo.i18n + # oslo.log + # oslo.serialization + # oslo.utils + # python-keystoneclient + # python-manilaclient + # stevedore +pika==1.1.0 + # via cloudify-common +pkginfo==1.9.6 + # via wagon +portalocker==2.7.0 + # via msal-extensions +prettytable==0.7.2 + # via + # cliff + # python-manilaclient +proxy_tools==0.1.0 + # via cloudify-common +psutil==5.9.6 + # via cloudify-utilities-plugins-sdk +pyasn1==0.5.1 + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.3.0 + # via google-auth +pycdlib==1.14.0 + # via cloudify-utilities-plugins-sdk +pycparser==2.21 + # via cffi +pycryptodome==3.9.9 + # via cloudify-openstack-plugin (setup.py) +pyinotify==0.9.6 + # via oslo.log +pyjwt[crypto]==2.4.0 + # via + # adal + # msal +pynacl==1.5.0 + # via paramiko +pyparsing==3.0.7 + # via + # cliff + # oslo.utils + # packaging +pyperclip==1.8.2 + # via cmd2 +python-dateutil==2.8.2 + # via + # adal + # botocore + # kubernetes + # oslo.log +python-keystoneclient==4.5.0 + # via python-manilaclient +python-manilaclient==2.0.0 + # via cloudify-openstack-plugin (setup.py) +pytz==2021.3 + # via + # babel + # cloudify-common + # oslo.serialization + # oslo.utils +pyyaml==6.0.1 + # via + # cliff + # cloudify-utilities-plugins-sdk + # kubernetes + # openstacksdk + # oslo.config +requests==2.27.1 + # via + # adal + # azure-core + # cloudify-common + # cloudify-utilities-plugins-sdk + # keystoneauth1 + # kubernetes + # msal + # msrest + # oslo.config + # python-keystoneclient + # python-manilaclient + # requests-oauthlib + # requests-toolbelt +requests-oauthlib==1.3.1 + # via + # kubernetes + # msrest +requests_toolbelt==0.9.1 + # via cloudify-common +requestsexceptions==1.4.0 + # via openstacksdk +retrying==1.3.3 + # via cloudify-common +rfc3986==1.5.0 + # via oslo.config +rsa==4.9 + # via google-auth +s3transfer==0.5.2 + # via boto3 +simplejson==3.19.2 + # via + # osc-lib + # python-manilaclient +six==1.16.0 + # via + # azure-core + # azure-identity + # google-auth + # isodate + # keystoneauth1 + # kubernetes + # msrestazure + # python-dateutil + # python-keystoneclient + # python-manilaclient + # retrying +smmap==5.0.0 + # via gitdb +stevedore==3.5.2 + # via + # cliff + # keystoneauth1 + # osc-lib + # oslo.config + # python-keystoneclient +typing-extensions==4.1.1 + # via + # aiohttp + # azure-core + # cmd2 + # gitpython + # importlib-metadata + # yarl +urllib3==1.26.18 + # via + # botocore + # kubernetes + # requests +wagon==1.0.1 + # via cloudify-common +wcwidth==0.2.12 + # via cmd2 +websocket-client==1.3.1 + # via kubernetes +wheel==0.37.1 + # via wagon +wrapt==1.16.0 + # via debtcollector +xmltodict==0.13.0 + # via cloudify-utilities-plugins-sdk +yarl==1.7.2 + # via aiohttp +zipp==3.6.0 + # via + # importlib-metadata + # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements.in b/requirements.in new file mode 100644 index 00000000..3110e285 --- /dev/null +++ b/requirements.in @@ -0,0 +1,6 @@ +dogpile.cache===0.9.2 +-e fusion-common +-e fusion-manager/mgmtworker +-e fusion-agent +-e cloudify-utilities-plugins-sdk +cryptography>=41.0.5 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..4d98cedd --- /dev/null +++ b/requirements.txt @@ -0,0 +1,416 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-emit-index-url --output-file=requirements.txt requirements.in setup.py +# +-e cloudify-utilities-plugins-sdk + # via + # -r requirements.in + # cloudify-openstack-plugin (setup.py) +-e fusion-agent + # via + # -r requirements.in + # fusion-mgmtworker +-e fusion-common + # via + # -r requirements.in + # cloudify-openstack-plugin (setup.py) + # cloudify-utilities-plugins-sdk + # fusion-agent + # fusion-mgmtworker +-e fusion-manager/mgmtworker + # via + # -r requirements.in + # cloudify-openstack-plugin (setup.py) +adal==1.2.7 + # via msrestazure +aiohttp==3.9.1 + # via fusion-common +aiosignal==1.3.1 + # via aiohttp +appdirs==1.4.3 + # via + # fusion-agent + # openstacksdk +attrs==23.1.0 + # via + # aiohttp + # cmd2 +autopage==0.5.2 + # via cliff +azure-common==1.1.28 + # via azure-mgmt-containerservice +azure-core==1.29.5 + # via + # azure-identity + # azure-mgmt-core + # msrest +azure-identity==1.15.0 + # via cloudify-utilities-plugins-sdk +azure-mgmt-containerservice==17.0.0 + # via cloudify-utilities-plugins-sdk +azure-mgmt-core==1.4.0 + # via azure-mgmt-containerservice +babel==2.13.1 + # via python-manilaclient +bcrypt==4.1.1 + # via paramiko +boto3==1.33.2 + # via cloudify-utilities-plugins-sdk +botocore==1.33.2 + # via + # boto3 + # s3transfer +bottle==0.12.25 + # via fusion-common +cachetools==5.3.2 + # via google-auth +certifi==2023.11.17 + # via + # fusion-mgmtworker + # kubernetes + # msrest + # requests +cffi==1.16.0 + # via + # cryptography + # pynacl +charset-normalizer==3.3.2 + # via requests +click==8.1.7 + # via fusion-agent +cliff==4.4.0 + # via osc-lib +cmd2==2.4.3 + # via cliff +cryptography==41.0.7 + # via + # -r requirements.in + # adal + # azure-identity + # fusion-mgmtworker + # msal + # openstacksdk + # paramiko + # pyjwt +debtcollector==2.5.0 + # via + # oslo-config + # oslo-context + # oslo-log + # oslo-utils + # python-keystoneclient + # python-manilaclient +decorator==5.1.1 + # via + # dogpile-cache + # openstacksdk +distro==1.8.0 + # via fusion-common +dogpile-cache===0.9.2 + # via + # -r requirements.in + # openstacksdk +fasteners==0.19 + # via fusion-common +frozenlist==1.4.0 + # via + # aiohttp + # aiosignal +gitdb==4.0.11 + # via + # cloudify-utilities-plugins-sdk + # gitpython +gitpython==3.1.40 + # via cloudify-utilities-plugins-sdk +google-auth==2.15.0 + # via + # cloudify-utilities-plugins-sdk + # kubernetes +idna==3.6 + # via + # requests + # yarl +importlib-metadata==6.8.0 + # via cliff +ipy==0.81 + # via cloudify-openstack-plugin (setup.py) +iso8601==2.1.0 + # via + # keystoneauth1 + # openstacksdk + # oslo-utils +isodate==0.6.1 + # via msrest +jinja2==3.1.2 + # via + # cloudify-utilities-plugins-sdk + # fusion-agent + # fusion-common +jmespath==1.0.1 + # via + # boto3 + # botocore + # openstacksdk +jsonpatch==1.33 + # via openstacksdk +jsonpointer==2.4 + # via jsonpatch +keystoneauth1==5.4.0 + # via + # openstacksdk + # osc-lib + # python-keystoneclient +kubernetes==26.1.0 + # via cloudify-utilities-plugins-sdk +markupsafe==2.1.3 + # via jinja2 +msal==1.25.0 + # via + # azure-identity + # msal-extensions +msal-extensions==1.0.0 + # via azure-identity +msgpack==1.0.7 + # via oslo-serialization +msrest==0.7.1 + # via + # azure-mgmt-containerservice + # msrestazure +msrestazure==0.6.4 + # via cloudify-utilities-plugins-sdk +multidict==6.0.4 + # via + # aiohttp + # yarl +munch==4.0.0 + # via openstacksdk +netaddr==0.9.0 + # via + # oslo-config + # oslo-utils +netifaces==0.11.0 + # via + # openstacksdk + # oslo-utils +networkx==2.8.8 + # via fusion-common +oauthlib==3.2.2 + # via requests-oauthlib +openstacksdk==0.53.0 + # via + # cloudify-openstack-plugin (setup.py) + # osc-lib +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +osc-lib==2.9.0 + # via python-manilaclient +oslo-config==9.2.0 + # via + # oslo-log + # python-keystoneclient + # python-manilaclient +oslo-context==5.3.0 + # via oslo-log +oslo-i18n==6.2.0 + # via + # osc-lib + # oslo-config + # oslo-log + # oslo-utils + # python-keystoneclient +oslo-log==5.4.0 + # via python-manilaclient +oslo-serialization==5.2.0 + # via + # oslo-log + # python-keystoneclient + # python-manilaclient +oslo-utils==6.3.0 + # via + # osc-lib + # oslo-log + # oslo-serialization + # python-keystoneclient + # python-manilaclient +packaging==21.3 + # via + # cloudify-utilities-plugins-sdk + # fusion-agent + # fusion-mgmtworker + # oslo-utils + # python-keystoneclient +paramiko==3.3.1 + # via cloudify-utilities-plugins-sdk +pbr==6.0.0 + # via + # keystoneauth1 + # openstacksdk + # os-service-types + # osc-lib + # oslo-context + # oslo-i18n + # oslo-log + # oslo-serialization + # python-keystoneclient + # python-manilaclient + # stevedore +pika==1.3.2 + # via fusion-common +pkginfo==1.9.6 + # via wagon +portalocker==2.8.2 + # via msal-extensions +prettytable==0.7.2 + # via + # cliff + # python-manilaclient +proxy-tools==0.1.0 + # via fusion-common +psutil==5.9.6 + # via cloudify-utilities-plugins-sdk +psycopg2==2.9.9 + # via fusion-mgmtworker +pyasn1==0.5.1 + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.3.0 + # via google-auth +pycdlib==1.14.0 + # via cloudify-utilities-plugins-sdk +pycparser==2.21 + # via cffi +pycryptodome==3.9.9 + # via cloudify-openstack-plugin (setup.py) +pyinotify==0.9.6 + # via oslo-log +pyjwt[crypto]==2.8.0 + # via + # adal + # msal +pynacl==1.5.0 + # via paramiko +pyparsing==3.1.1 + # via + # oslo-utils + # packaging +pyperclip==1.8.2 + # via cmd2 +python-dateutil==2.8.2 + # via + # adal + # botocore + # fusion-mgmtworker + # kubernetes + # oslo-log +python-keystoneclient==5.2.0 + # via python-manilaclient +python-manilaclient==2.0.0 + # via cloudify-openstack-plugin (setup.py) +pytz==2023.3.post1 + # via + # fusion-common + # fusion-mgmtworker + # oslo-serialization + # oslo-utils +pyyaml==6.0 + # via + # cliff + # cloudify-utilities-plugins-sdk + # fusion-common + # kubernetes + # openstacksdk + # oslo-config + # oslo-utils +requests==2.31.0 + # via + # adal + # azure-core + # cloudify-utilities-plugins-sdk + # fusion-agent + # fusion-common + # keystoneauth1 + # kubernetes + # msal + # msrest + # oslo-config + # python-keystoneclient + # python-manilaclient + # requests-oauthlib + # requests-toolbelt +requests-oauthlib==1.3.1 + # via + # kubernetes + # msrest +requests-toolbelt==1.0.0 + # via + # cloudify-utilities-plugins-sdk + # fusion-common +requestsexceptions==1.4.0 + # via openstacksdk +retrying==1.3.4 + # via fusion-mgmtworker +rfc3986==2.0.0 + # via oslo-config +rsa==4.9 + # via google-auth +s3transfer==0.8.1 + # via boto3 +simplejson==3.19.2 + # via + # osc-lib + # python-manilaclient +six==1.16.0 + # via + # azure-core + # google-auth + # isodate + # kubernetes + # msrestazure + # python-dateutil + # python-keystoneclient + # python-manilaclient + # retrying +smmap==5.0.1 + # via gitdb +stevedore==5.1.0 + # via + # cliff + # keystoneauth1 + # osc-lib + # oslo-config + # python-keystoneclient +typing-extensions==4.8.0 + # via azure-core +tzdata==2023.3 + # via + # oslo-serialization + # oslo-utils +urllib3==2.0.7 + # via + # botocore + # kubernetes + # requests +wagon==1.0.1 + # via fusion-common +wcwidth==0.2.12 + # via cmd2 +websocket-client==1.6.4 + # via kubernetes +wheel==0.42.0 + # via wagon +wrapt==1.16.0 + # via debtcollector +xmltodict==0.13.0 + # via cloudify-utilities-plugins-sdk +yarl==1.9.3 + # via aiohttp +zipp==3.17.0 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/setup.py b/setup.py index b58105bc..0c091fe7 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ import os import re import pathlib +import sys from setuptools import setup, find_packages @@ -27,6 +28,40 @@ def get_version(): return re.search(r'\d+.\d+.\d+', var).group() +install_requires = [ + 'openstacksdk==0.53.0', + 'IPy==0.81', + 'pycryptodome>=3.9.8,<3.10', + 'python-manilaclient==2.0.0' +] + +if sys.version_info.major == 3 and sys.version_info.minor == 6: + install_requires += [ + 'cloudify-common>=4.5,<7.0', + 'cloudify-utilities-plugins-sdk>=0.0.91', # includes YAML + ] + packages = [ + 'openstack_plugin', + 'openstack_sdk', + 'openstack_plugin.resources', + 'openstack_plugin.resources.compute', + 'openstack_plugin.resources.dns_service', + 'openstack_plugin.resources.identity', + 'openstack_plugin.resources.network', + 'openstack_plugin.resources.share', + 'openstack_plugin.resources.volume', + 'openstack_plugin.tests.dns_service', + 'openstack_sdk.resources', + ] +else: + install_requires += [ + 'fusion-common', + 'fusion-mgmtworker', + 'cloudify-utilities-plugins-sdk', + ] + packages = find_packages(exclude=['tests*']) + + setup( name='cloudify-openstack-plugin', version=get_version(), @@ -34,16 +69,6 @@ def get_version(): author_email='info@cloudify.co', license='LICENSE', zip_safe=False, - packages=find_packages(exclude=['tests*']), - install_requires=[ - 'cloudify-common>=4.5.5', - 'openstacksdk==0.53.0', - 'IPy==0.81', - 'pycryptodome>=3.9.8,<3.10', - 'python-manilaclient==2.0.0' - ], - test_requires=[ - 'mock', - 'requests-mock' - ] + packages=packages, + install_requires=install_requires, ) \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 8faf600a..6b521c0d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,12 +2,11 @@ nose-testconfig>=0.9 nose>=1.3 nose-cov>=1.3 mock>=1.0 -flake8==3.7.9 -tox==3.14.6 +flake8 sh==1.11 IPy==0.81 pylint # For integration tests -pytest==4.6.3 -pyyaml>=5.4.1,<5.5 +pytest +requests-mock \ No newline at end of file diff --git a/tox.ini b/tox.ini index 70f7b7f4..df513f40 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ setenv = usedevelop = True install_command = pip install -U {opts} {packages} -deps = -r{toxinidir}/dev-requirements.txt +deps = -r{toxinidir}/requirements-3.6.txt -r{toxinidir}/test-requirements.txt whitelist_externals = bash diff --git a/v2_plugin.yaml b/v2_plugin.yaml index 90168b48..2966b5c8 100644 --- a/v2_plugin.yaml +++ b/v2_plugin.yaml @@ -3,7 +3,7 @@ plugins: openstack: executor: central_deployment_agent package_name: cloudify-openstack-plugin - package_version: 3.3.6 + package_version: 3.3.7 dsl_definitions: