Fix oslo imports
sed -i 's/oslo\./oslo_/g' $f
This commit is contained in:
		@@ -14,7 +14,7 @@
 | 
			
		||||
#    under the License.
 | 
			
		||||
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
 | 
			
		||||
from quark.db import api as db_api
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
import webob
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
 | 
			
		||||
import netaddr
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
 | 
			
		||||
from quark import allocation_pool
 | 
			
		||||
 
 | 
			
		||||
@@ -18,9 +18,9 @@ from neutron.common import exceptions
 | 
			
		||||
from neutron.db import quota_db as qdb
 | 
			
		||||
from neutron.extensions import providernet as pnet
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo.utils import importutils
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
from oslo_utils import importutils
 | 
			
		||||
from oslo_utils import uuidutils
 | 
			
		||||
 | 
			
		||||
from quark.db import api as db_api
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ import netaddr
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from neutron.extensions import securitygroup as sg_ext
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
from oslo_utils import uuidutils
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,7 @@
 | 
			
		||||
#    License for the specific language governing permissions and limitations
 | 
			
		||||
#    under the License.
 | 
			
		||||
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
 | 
			
		||||
CONF = cfg.CONF
 | 
			
		||||
 
 | 
			
		||||
@@ -16,9 +16,9 @@
 | 
			
		||||
import netaddr
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo.utils import importutils
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
from oslo_utils import importutils
 | 
			
		||||
 | 
			
		||||
from quark import allocation_pool
 | 
			
		||||
from quark.db import api as db_api
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@
 | 
			
		||||
from neutron.common import exceptions
 | 
			
		||||
from neutron.extensions import securitygroup as sg_ext
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
from oslo_utils import uuidutils
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -19,10 +19,10 @@ from neutron.common import exceptions
 | 
			
		||||
from neutron.common import rpc as n_rpc
 | 
			
		||||
from neutron.db import quota_db as qdb
 | 
			
		||||
from neutron import quota
 | 
			
		||||
from oslo.config import cfg
 | 
			
		||||
from oslo.utils import importutils
 | 
			
		||||
from oslo.utils import timeutils
 | 
			
		||||
from oslo_config import cfg
 | 
			
		||||
from oslo_log import log as logging
 | 
			
		||||
from oslo_utils import importutils
 | 
			
		||||
from oslo_utils import timeutils
 | 
			
		||||
 | 
			
		||||
from quark import allocation_pool
 | 
			
		||||
from quark.db import api as db_api
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user