Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7467c710f6 | ||
|
|
b720fdaee7 | ||
|
|
143db0177a | ||
|
|
8c72cc87da | ||
| 4575bea5a6 | |||
|
|
28628e8f96 | ||
|
|
6ca3341352 | ||
|
|
517bef2c54 | ||
|
|
d75e1e05b7 | ||
|
|
a92d8db81c | ||
|
|
3b80135a3d | ||
|
|
3a65712b45 | ||
|
|
1df1f38a91 | ||
| 792ad115b3 | |||
| ee73a48881 | |||
|
|
4b29df7234 | ||
|
|
cff9c266c0 | ||
|
|
983f0abc58 | ||
|
|
f83108d858 | ||
|
|
e647baf4ca | ||
|
|
2f047b1595 | ||
|
|
23fb666f92 | ||
|
|
a1ebfaa7f2 | ||
|
|
adf21f0288 | ||
|
|
ae397565be | ||
|
|
d6c211c139 | ||
|
|
76dd26f9fd | ||
|
|
439e290e95 | ||
|
|
10227b681f | ||
|
|
2c2a1f4de7 | ||
|
|
f6d147e031 | ||
|
|
7a1dca4131 | ||
|
|
26ab1b1d0c | ||
|
|
d87683b59b | ||
| f3756a3d4a | |||
| 12373768da | |||
|
|
3140fe014a |
@@ -2,4 +2,3 @@
|
||||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/python-neutronclient.git
|
||||
defaultbranch=stable/wallaby
|
||||
|
||||
25
.zuul.yaml
25
.zuul.yaml
@@ -1,7 +1,7 @@
|
||||
- project:
|
||||
templates:
|
||||
- openstack-cover-jobs
|
||||
- openstack-python3-wallaby-jobs
|
||||
- openstack-python3-zed-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- check-requirements
|
||||
- lib-forward-testing-python3
|
||||
@@ -37,10 +37,33 @@
|
||||
# NOTE: neutronclient.tests.functional.base.ClientTestBase does not
|
||||
# support HTTPS endpoints now, so tls-proxy needs to be disabled.
|
||||
tls-proxy: false
|
||||
# Disable OVN services
|
||||
br-ex-tcpdump: false
|
||||
br-int-flows: false
|
||||
ovn-controller: false
|
||||
ovn-northd: false
|
||||
ovs-vswitchd: false
|
||||
ovsdb-server: false
|
||||
q-ovn-metadata-agent: false
|
||||
# Neutron services
|
||||
q-agt: true
|
||||
q-dhcp: true
|
||||
q-l3: true
|
||||
q-meta: true
|
||||
neutron-network-segment-range: true
|
||||
neutron-segments: true
|
||||
q-metering: true
|
||||
q-qos: true
|
||||
neutron-tag-ports-during-bulk-creation: true
|
||||
neutron-conntrack-helper: true
|
||||
devstack_localrc:
|
||||
USE_PYTHON3: true
|
||||
LIBS_FROM_GIT: python-neutronclient
|
||||
Q_AGENT: openvswitch
|
||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
||||
devstack_plugins:
|
||||
neutron: https://opendev.org/openstack/neutron
|
||||
neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas
|
||||
|
||||
- job:
|
||||
|
||||
@@ -91,17 +91,17 @@ Transition Steps
|
||||
|
||||
* **Done** `Security Group Rule CRUD <https://bugs.launchpad.net/python-openstackclient/+bug/1519512>`_
|
||||
|
||||
6. **In Progress:** OSC continues enhancing its networking support.
|
||||
6. **Done** OSC continues enhancing its networking support.
|
||||
At this point and when applicable, enhancements to the ``neutron``
|
||||
CLI must also be made to the ``openstack`` CLI and possibly the
|
||||
OpenStack Python SDK. Users of the neutron client's command extensions
|
||||
should start their transition to the OSC plugin system. See the
|
||||
developer guide section below for more information on this step.
|
||||
|
||||
7. **In Progress:** Deprecate the ``neutron`` CLI. Running the CLI after
|
||||
7. **Done** Deprecate the ``neutron`` CLI. Running the CLI after
|
||||
it has been `deprecated <https://review.opendev.org/#/c/393903/>`_
|
||||
will issue a warning message:
|
||||
``neutron CLI is deprecated and will be removed in the future. Use openstack CLI instead.``
|
||||
``neutron CLI is deprecated and will be removed in the Z cycle. Use openstack CLI instead.``
|
||||
In addition, no new features will be added to the CLI, though fixes to
|
||||
the CLI will be assessed on a case by case basis.
|
||||
|
||||
|
||||
@@ -61,9 +61,9 @@ class HTTPClient(object):
|
||||
token=None, region_name=None, timeout=None,
|
||||
endpoint_url=None, insecure=False,
|
||||
endpoint_type='publicURL',
|
||||
auth_strategy='keystone', ca_cert=None, log_credentials=False,
|
||||
service_type='network', global_request_id=None,
|
||||
**kwargs):
|
||||
auth_strategy='keystone', ca_cert=None, cert=None,
|
||||
log_credentials=False, service_type='network',
|
||||
global_request_id=None, **kwargs):
|
||||
|
||||
self.username = username
|
||||
self.user_id = user_id
|
||||
@@ -82,6 +82,7 @@ class HTTPClient(object):
|
||||
self.auth_strategy = auth_strategy
|
||||
self.log_credentials = log_credentials
|
||||
self.global_request_id = global_request_id
|
||||
self.cert = cert
|
||||
if insecure:
|
||||
self.verify_cert = False
|
||||
else:
|
||||
@@ -167,6 +168,7 @@ class HTTPClient(object):
|
||||
data=body,
|
||||
headers=headers,
|
||||
verify=self.verify_cert,
|
||||
cert=self.cert,
|
||||
timeout=self.timeout,
|
||||
**kwargs)
|
||||
|
||||
@@ -189,7 +191,7 @@ class HTTPClient(object):
|
||||
try:
|
||||
kwargs['headers'] = kwargs.get('headers') or {}
|
||||
if self.auth_token is None:
|
||||
self.auth_token = "" # nosec
|
||||
self.auth_token = ""
|
||||
kwargs['headers']['X-Auth-Token'] = self.auth_token
|
||||
resp, body = self._cs_request(self.endpoint_url + url, method,
|
||||
**kwargs)
|
||||
@@ -399,6 +401,7 @@ def construct_http_client(username=None,
|
||||
log_credentials=None,
|
||||
auth_strategy='keystone',
|
||||
ca_cert=None,
|
||||
cert=None,
|
||||
service_type='network',
|
||||
session=None,
|
||||
global_request_id=None,
|
||||
@@ -430,6 +433,7 @@ def construct_http_client(username=None,
|
||||
endpoint_type=endpoint_type,
|
||||
service_type=service_type,
|
||||
ca_cert=ca_cert,
|
||||
cert=cert,
|
||||
log_credentials=log_credentials,
|
||||
auth_strategy=auth_strategy,
|
||||
global_request_id=global_request_id)
|
||||
|
||||
@@ -245,15 +245,15 @@ class CreatePort(neutronV20.CreateCommand, UpdatePortSecGroupMixin,
|
||||
parser.add_argument(
|
||||
'--vnic-type',
|
||||
metavar='<direct | direct-physical | macvtap '
|
||||
'| normal | baremetal>',
|
||||
'| normal | baremetal | smart-nic>',
|
||||
choices=['direct', 'direct-physical', 'macvtap',
|
||||
'normal', 'baremetal'],
|
||||
'normal', 'baremetal', 'smart-nic'],
|
||||
type=utils.convert_to_lowercase,
|
||||
help=_('VNIC type for this port.'))
|
||||
parser.add_argument(
|
||||
'--vnic_type',
|
||||
choices=['direct', 'direct-physical', 'macvtap',
|
||||
'normal', 'baremetal'],
|
||||
'normal', 'baremetal', 'smart-nic'],
|
||||
type=utils.convert_to_lowercase,
|
||||
help=argparse.SUPPRESS)
|
||||
parser.add_argument(
|
||||
|
||||
@@ -637,7 +637,7 @@ class NeutronShell(app.App):
|
||||
def main(argv=sys.argv[1:]):
|
||||
try:
|
||||
print(_("neutron CLI is deprecated and will be removed "
|
||||
"in the future. Use openstack CLI instead."), file=sys.stderr)
|
||||
"in the Z cycle. Use openstack CLI instead."), file=sys.stderr)
|
||||
return NeutronShell(NEUTRON_API_VERSION).run(
|
||||
list(map(encodeutils.safe_decode, argv)))
|
||||
except KeyboardInterrupt:
|
||||
|
||||
@@ -64,9 +64,13 @@ class SimpleReadOnlyNeutronClientTest(base.ClientTestBase):
|
||||
self.neutron('floatingip-list')
|
||||
|
||||
def test_neutron_meter_label_list(self):
|
||||
if not self.is_extension_enabled('metering'):
|
||||
self.skipTest('metering is not enabled')
|
||||
self.neutron('meter-label-list')
|
||||
|
||||
def test_neutron_meter_label_rule_list(self):
|
||||
if not self.is_extension_enabled('metering'):
|
||||
self.skipTest('metering is not enabled')
|
||||
self.neutron('meter-label-rule-list')
|
||||
|
||||
def test_neutron_net_external_list(self):
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright 2012 Red Hat
|
||||
# All Rights Reserved.
|
||||
#
|
||||
|
||||
@@ -214,6 +214,26 @@ class CLITestV20PortJSON(test_cli20.CLITestV20Base):
|
||||
self._test_create_resource(resource, cmd, name, myid, args,
|
||||
position_names, position_values)
|
||||
|
||||
def test_create_port_vnic_type_smart_nic(self):
|
||||
# Create port: --vnic_type smart-nic netid.
|
||||
resource = 'port'
|
||||
cmd = port.CreatePort(test_cli20.MyApp(sys.stdout), None)
|
||||
name = 'myname'
|
||||
myid = 'myid'
|
||||
netid = 'netid'
|
||||
args = ['--vnic_type', 'smart-nic', netid]
|
||||
position_names = ['binding:vnic_type', 'network_id']
|
||||
position_values = ['smart-nic', netid]
|
||||
self._test_create_resource(resource, cmd, name, myid, args,
|
||||
position_names, position_values)
|
||||
|
||||
# Test dashed options
|
||||
args = ['--vnic-type', 'smart-nic', netid]
|
||||
position_names = ['binding:vnic_type', 'network_id']
|
||||
position_values = ['smart-nic', netid]
|
||||
self._test_create_resource(resource, cmd, name, myid, args,
|
||||
position_names, position_values)
|
||||
|
||||
def test_create_port_with_binding_profile(self):
|
||||
resource = 'port'
|
||||
cmd = port.CreatePort(test_cli20.MyApp(sys.stdout), None)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright 2012 Red Hat
|
||||
# All Rights Reserved.
|
||||
#
|
||||
|
||||
@@ -217,5 +217,5 @@ class CLITestV20ExtensionJSONChildResource(test_cli20.CLITestV20Base):
|
||||
self.client.delete_parents_child,
|
||||
self.client.create_parents_child)
|
||||
for method in methods:
|
||||
argspec = inspect.getargspec(method)
|
||||
argspec = inspect.getfullargspec(method)
|
||||
self.assertIn("parent_id", argspec.args)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (C) 2013 Yahoo! Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
|
||||
@@ -357,10 +357,10 @@ class ShellTest(testtools.TestCase):
|
||||
self.useFixture(fixtures.MockPatchObject(openstack_shell,
|
||||
'COMMANDS', None))
|
||||
openstack_shell.NeutronShell('2.0')
|
||||
self.assertDictContainsSubset(
|
||||
self.assertLessEqual(
|
||||
{'net-create': network.CreateNetwork,
|
||||
'net-delete': network.DeleteNetwork,
|
||||
'net-list': network.ListNetwork,
|
||||
'net-show': network.ShowNetwork,
|
||||
'net-update': network.UpdateNetwork},
|
||||
openstack_shell.COMMANDS['2.0'])
|
||||
'net-update': network.UpdateNetwork}.items(),
|
||||
openstack_shell.COMMANDS['2.0'].items())
|
||||
|
||||
@@ -216,6 +216,10 @@ class ClientBase(object):
|
||||
:param bool log_credentials: Allow for logging of passwords or not.
|
||||
Defaults to False. (optional)
|
||||
:param string ca_cert: SSL CA bundle file to use. (optional)
|
||||
:param cert: A client certificate to pass to requests. These are of the
|
||||
same form as requests expects. Either a single filename
|
||||
containing both the certificate and key or a tuple containing
|
||||
the path to the certificate then a path to the key. (optional)
|
||||
:param integer retries: How many times idempotent (GET, PUT, DELETE)
|
||||
requests to Neutron server should be retried if
|
||||
they fail (default: 0).
|
||||
@@ -511,6 +515,8 @@ class Client(ClientBase):
|
||||
router_path = "/routers/%s"
|
||||
floatingips_path = "/floatingips"
|
||||
floatingip_path = "/floatingips/%s"
|
||||
port_forwardings_path = "/floatingips/%s/port_forwardings"
|
||||
port_forwarding_path = "/floatingips/%s/port_forwardings/%s"
|
||||
security_groups_path = "/security-groups"
|
||||
security_group_path = "/security-groups/%s"
|
||||
security_group_rules_path = "/security-group-rules"
|
||||
@@ -615,12 +621,20 @@ class Client(ClientBase):
|
||||
qos_policy_path = "/qos/policies/%s"
|
||||
qos_bandwidth_limit_rules_path = "/qos/policies/%s/bandwidth_limit_rules"
|
||||
qos_bandwidth_limit_rule_path = "/qos/policies/%s/bandwidth_limit_rules/%s"
|
||||
qos_packet_rate_limit_rules_path = \
|
||||
"/qos/policies/%s/packet_rate_limit_rules"
|
||||
qos_packet_rate_limit_rule_path = \
|
||||
"/qos/policies/%s/packet_rate_limit_rules/%s"
|
||||
qos_dscp_marking_rules_path = "/qos/policies/%s/dscp_marking_rules"
|
||||
qos_dscp_marking_rule_path = "/qos/policies/%s/dscp_marking_rules/%s"
|
||||
qos_minimum_bandwidth_rules_path = \
|
||||
"/qos/policies/%s/minimum_bandwidth_rules"
|
||||
qos_minimum_bandwidth_rule_path = \
|
||||
"/qos/policies/%s/minimum_bandwidth_rules/%s"
|
||||
qos_minimum_packet_rate_rules_path = \
|
||||
"/qos/policies/%s/minimum_packet_rate_rules"
|
||||
qos_minimum_packet_rate_rule_path = \
|
||||
"/qos/policies/%s/minimum_packet_rate_rules/%s"
|
||||
qos_rule_types_path = "/qos/rule-types"
|
||||
qos_rule_type_path = "/qos/rule-types/%s"
|
||||
flavors_path = "/flavors"
|
||||
@@ -704,7 +718,9 @@ class Client(ClientBase):
|
||||
'qos_policies': 'qos_policy',
|
||||
'policies': 'policy',
|
||||
'bandwidth_limit_rules': 'bandwidth_limit_rule',
|
||||
'packet_rate_limit_rules': 'packet_rate_limit_rule',
|
||||
'minimum_bandwidth_rules': 'minimum_bandwidth_rule',
|
||||
'minimum_packet_rate_rules': 'minimum_packet_rate_rule',
|
||||
'rules': 'rule',
|
||||
'dscp_marking_rules': 'dscp_marking_rule',
|
||||
'rule_types': 'rule_type',
|
||||
@@ -1005,6 +1021,32 @@ class Client(ClientBase):
|
||||
"""Deletes the specified floatingip."""
|
||||
return self.delete(self.floatingip_path % (floatingip))
|
||||
|
||||
def show_port_forwarding(self, floatingip, portforwarding):
|
||||
"""Fetches information of a certain portforwarding"""
|
||||
return self.get(self.port_forwarding_path % (floatingip,
|
||||
portforwarding))
|
||||
|
||||
def list_port_forwardings(self, floatingip, retrieve_all=True, **_params):
|
||||
"""Fetches a list of all portforwardings for a floatingip."""
|
||||
return self.list('port_forwardings',
|
||||
self.port_forwardings_path % floatingip, retrieve_all,
|
||||
**_params)
|
||||
|
||||
def create_port_forwarding(self, floatingip, body=None):
|
||||
"""Creates a new portforwarding."""
|
||||
return self.post(self.port_forwardings_path % floatingip, body=body)
|
||||
|
||||
def delete_port_forwarding(self, floatingip, portforwarding):
|
||||
"""Deletes the specified portforwarding."""
|
||||
return self.delete(self.port_forwarding_path % (floatingip,
|
||||
portforwarding))
|
||||
|
||||
def update_port_forwarding(self, floatingip, portforwarding, body=None):
|
||||
"""Updates a portforwarding."""
|
||||
return self.put(self.port_forwarding_path % (floatingip,
|
||||
portforwarding),
|
||||
body=body)
|
||||
|
||||
def create_security_group(self, body=None):
|
||||
"""Creates a new security group."""
|
||||
return self.post(self.security_groups_path, body=body)
|
||||
@@ -1968,6 +2010,35 @@ class Client(ClientBase):
|
||||
return self.post(self.qos_minimum_bandwidth_rules_path % policy,
|
||||
body=body)
|
||||
|
||||
def list_packet_rate_limit_rules(self, policy_id, retrieve_all=True,
|
||||
**_params):
|
||||
"""Fetches a list of all packet rate limit rules for the given policy
|
||||
|
||||
"""
|
||||
return self.list('packet_rate_limit_rules',
|
||||
self.qos_packet_rate_limit_rules_path %
|
||||
policy_id, retrieve_all, **_params)
|
||||
|
||||
def show_packet_rate_limit_rule(self, rule, policy, body=None):
|
||||
"""Fetches information of a certain packet rate limit rule."""
|
||||
return self.get(self.qos_packet_rate_limit_rule_path %
|
||||
(policy, rule), body=body)
|
||||
|
||||
def create_packet_rate_limit_rule(self, policy, body=None):
|
||||
"""Creates a new packet rate limit rule."""
|
||||
return self.post(self.qos_packet_rate_limit_rules_path % policy,
|
||||
body=body)
|
||||
|
||||
def update_packet_rate_limit_rule(self, rule, policy, body=None):
|
||||
"""Updates a packet rate limit rule."""
|
||||
return self.put(self.qos_packet_rate_limit_rule_path %
|
||||
(policy, rule), body=body)
|
||||
|
||||
def delete_packet_rate_limit_rule(self, rule, policy):
|
||||
"""Deletes a packet rate limit rule."""
|
||||
return self.delete(self.qos_packet_rate_limit_rule_path %
|
||||
(policy, rule))
|
||||
|
||||
def update_minimum_bandwidth_rule(self, rule, policy, body=None):
|
||||
"""Updates a minimum bandwidth rule."""
|
||||
return self.put(self.qos_minimum_bandwidth_rule_path %
|
||||
@@ -1978,6 +2049,35 @@ class Client(ClientBase):
|
||||
return self.delete(self.qos_minimum_bandwidth_rule_path %
|
||||
(policy, rule))
|
||||
|
||||
def list_minimum_packet_rate_rules(self, policy_id, retrieve_all=True,
|
||||
**_params):
|
||||
"""Fetches a list of all minimum packet rate rules for the given policy
|
||||
|
||||
"""
|
||||
return self.list('minimum_packet_rate_rules',
|
||||
self.qos_minimum_packet_rate_rules_path %
|
||||
policy_id, retrieve_all, **_params)
|
||||
|
||||
def show_minimum_packet_rate_rule(self, rule, policy, body=None):
|
||||
"""Fetches information of a certain minimum packet rate rule."""
|
||||
return self.get(self.qos_minimum_packet_rate_rule_path %
|
||||
(policy, rule), body=body)
|
||||
|
||||
def create_minimum_packet_rate_rule(self, policy, body=None):
|
||||
"""Creates a new minimum packet rate rule."""
|
||||
return self.post(self.qos_minimum_packet_rate_rules_path % policy,
|
||||
body=body)
|
||||
|
||||
def update_minimum_packet_rate_rule(self, rule, policy, body=None):
|
||||
"""Updates a minimum packet rate rule."""
|
||||
return self.put(self.qos_minimum_packet_rate_rule_path %
|
||||
(policy, rule), body=body)
|
||||
|
||||
def delete_minimum_packet_rate_rule(self, rule, policy):
|
||||
"""Deletes a minimum packet rate rule."""
|
||||
return self.delete(self.qos_minimum_packet_rate_rule_path %
|
||||
(policy, rule))
|
||||
|
||||
def create_flavor(self, body=None):
|
||||
"""Creates a new Neutron service flavor."""
|
||||
return self.post(self.flavors_path, body=body)
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Add support to floating ip port forwarding.
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Python 3.6 & 3.7 support has been dropped. The minimum version of Python now
|
||||
supported is Python 3.8.
|
||||
@@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Added new client methods for QoS minimum packet rate rule:
|
||||
``list_minimum_packet_rate_rules``, ``show_minimum_packet_rate_rule``,
|
||||
``create_minimum_packet_rate_rule``, ``update_minimum_packet_rate_rule``,
|
||||
``delete_minimum_packet_rate_rule``.
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
deprecations:
|
||||
- |
|
||||
``neutron`` CLI will be removed in 'Z' release.
|
||||
While it has been marked as deprecated for removal for long,
|
||||
all features in ``neutron`` CLI have been supported in ``openstack`` CLI
|
||||
(OpenStackClient) as of Xena release and the neutron team plans to
|
||||
remove it in 'Z' release. Consider using ``openstack`` CLI and
|
||||
`Mapping Guide <https://docs.openstack.org/python-openstackclient/latest/cli/decoder.html#neutron-cli>`__
|
||||
in the OSC documentation would help you.
|
||||
@@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Added new client methods for QoS packet rate limit rule:
|
||||
``list_packet_rate_limit_rules``, ``show_packet_rate_limit_rule``,
|
||||
``create_packet_rate_limit_rule``, ``update_packet_rate_limit_rule``,
|
||||
``delete_packet_rate_limit_rule``.
|
||||
@@ -6,6 +6,9 @@
|
||||
:maxdepth: 1
|
||||
|
||||
unreleased
|
||||
yoga
|
||||
xena
|
||||
wallaby
|
||||
victoria
|
||||
ussuri
|
||||
train
|
||||
|
||||
6
releasenotes/source/wallaby.rst
Normal file
6
releasenotes/source/wallaby.rst
Normal file
@@ -0,0 +1,6 @@
|
||||
============================
|
||||
Wallaby Series Release Notes
|
||||
============================
|
||||
|
||||
.. release-notes::
|
||||
:branch: stable/wallaby
|
||||
6
releasenotes/source/xena.rst
Normal file
6
releasenotes/source/xena.rst
Normal file
@@ -0,0 +1,6 @@
|
||||
=========================
|
||||
Xena Series Release Notes
|
||||
=========================
|
||||
|
||||
.. release-notes::
|
||||
:branch: stable/xena
|
||||
6
releasenotes/source/yoga.rst
Normal file
6
releasenotes/source/yoga.rst
Normal file
@@ -0,0 +1,6 @@
|
||||
=========================
|
||||
Yoga Series Release Notes
|
||||
=========================
|
||||
|
||||
.. release-notes::
|
||||
:branch: stable/yoga
|
||||
@@ -1,3 +1,7 @@
|
||||
# Requirements lower bounds listed here are our best effort to keep them up to
|
||||
# date but we do not test them so no guarantee of having them all correct. If
|
||||
# you find any incorrect lower bounds, let us know or propose a fix.
|
||||
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
11
setup.cfg
11
setup.cfg
@@ -1,12 +1,12 @@
|
||||
[metadata]
|
||||
name = python-neutronclient
|
||||
summary = CLI and Client Library for OpenStack Networking
|
||||
description-file =
|
||||
description_file =
|
||||
README.rst
|
||||
author = OpenStack Networking Project
|
||||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/python-neutronclient/latest/
|
||||
python-requires = >=3.6
|
||||
author_email = openstack-discuss@lists.openstack.org
|
||||
home_page = https://docs.openstack.org/python-neutronclient/latest/
|
||||
python_requires = >=3.8
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Developers
|
||||
@@ -18,9 +18,8 @@ classifier =
|
||||
Programming Language :: Python :: Implementation :: CPython
|
||||
Programming Language :: Python :: 3 :: Only
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
Programming Language :: Python :: 3.8
|
||||
Programming Language :: Python :: 3.9
|
||||
|
||||
[files]
|
||||
packages =
|
||||
|
||||
19
tox.ini
19
tox.ini
@@ -1,6 +1,6 @@
|
||||
[tox]
|
||||
envlist = py38,pep8
|
||||
minversion = 2.3.2
|
||||
envlist = py39,pep8
|
||||
minversion = 3.18.0
|
||||
skipsdist = True
|
||||
ignore_basepython_conflict = True
|
||||
|
||||
@@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
usedevelop = True
|
||||
install_command = pip install {opts} {packages}
|
||||
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
|
||||
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
# Delete bytecodes from normal directories before running tests.
|
||||
@@ -23,7 +23,7 @@ commands = sh -c "find . -type d -name '.?*' -prune -o \
|
||||
\( -type d -name '__pycache__' -o -type f -name '*.py[co]' \) \
|
||||
-print0 | xargs -0 rm -rf"
|
||||
stestr run {posargs}
|
||||
whitelist_externals = sh
|
||||
allowlist_externals = sh
|
||||
|
||||
[testenv:pep8]
|
||||
commands =
|
||||
@@ -52,14 +52,14 @@ commands =
|
||||
|
||||
[testenv:docs]
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/doc/requirements.txt
|
||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:pdf-docs]
|
||||
envdir = {toxworkdir}/docs
|
||||
deps = {[testenv:docs]deps}
|
||||
whitelist_externals =
|
||||
allowlist_externals =
|
||||
make
|
||||
commands =
|
||||
sphinx-build -W -b latex doc/source doc/build/pdf
|
||||
@@ -67,7 +67,7 @@ commands =
|
||||
|
||||
[testenv:releasenotes]
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/doc/requirements.txt
|
||||
commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||
|
||||
@@ -81,5 +81,8 @@ enable-extensions=H904
|
||||
|
||||
[testenv:bandit]
|
||||
# B303: blacklist calls: md5, sha1
|
||||
# B105: The software contains a hard-coded password, which it uses for its own
|
||||
# inbound authentication or for outbound communication to external
|
||||
# components.
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
commands = bandit -r neutronclient -x tests -n5 -s B303
|
||||
commands = bandit -r neutronclient -x tests -n5 -s B303,B105
|
||||
|
||||
Reference in New Issue
Block a user