Remove a bunch of things we promised to remove in 2H 2017
Change-Id: I060559fe13e354fe87551cd9dd82774bddb54640
This commit is contained in:
parent
3a672eae7b
commit
2c2c16ba55
@ -1,28 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.api.auth import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.api.auth. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,29 +0,0 @@
|
||||
# Copyright 2016 NEC Corporation
|
||||
#
|
||||
# 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.
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.command.command import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.command.command. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,28 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.exceptions import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.exceptions. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,29 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.logs import * # noqa
|
||||
from osc_lib.logs import _FileFormatter # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.logs. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,28 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.cli.parseractions import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.cli.parseractions. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,50 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
"""Subclass of keystoneauth1.session"""
|
||||
|
||||
from keystoneauth1 import session
|
||||
|
||||
|
||||
class TimingSession(session.Session):
|
||||
"""A Session that supports collection of timing data per Method URL"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
**kwargs
|
||||
):
|
||||
"""Pass through all arguments except timing"""
|
||||
super(TimingSession, self).__init__(**kwargs)
|
||||
|
||||
# times is a list of tuples: ("method url", elapsed_time)
|
||||
self.times = []
|
||||
|
||||
def get_timings(self):
|
||||
return self.times
|
||||
|
||||
def reset_timings(self):
|
||||
self.times = []
|
||||
|
||||
def request(self, url, method, **kwargs):
|
||||
"""Wrap the usual request() method with the timers"""
|
||||
resp = super(TimingSession, self).request(url, method, **kwargs)
|
||||
for h in resp.history:
|
||||
self.times.append((
|
||||
"%s %s" % (h.request.method, h.request.url),
|
||||
h.elapsed,
|
||||
))
|
||||
self.times.append((
|
||||
"%s %s" % (resp.request.method, resp.request.url),
|
||||
resp.elapsed,
|
||||
))
|
||||
return resp
|
@ -1,28 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.command.timing import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.command.timing. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -1,28 +0,0 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
|
||||
# or Jun 2017.
|
||||
|
||||
import inspect
|
||||
import sys
|
||||
|
||||
from osc_lib.utils import * # noqa
|
||||
|
||||
|
||||
parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
|
||||
sys.stderr.write(
|
||||
"WARNING: %s is deprecated and will be removed after Jun 2017. "
|
||||
"Please use osc_lib.utils. This warning is caused by an "
|
||||
"out-of-date import in %s\n" % (__name__, parent_import)
|
||||
)
|
@ -15,8 +15,8 @@ import argparse
|
||||
|
||||
import mock
|
||||
import openstack
|
||||
from osc_lib import exceptions
|
||||
|
||||
from openstackclient.common import exceptions
|
||||
from openstackclient.network import common
|
||||
from openstackclient.tests.unit import utils
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user