openstack
/
astara-neutron
Code Issues Proposed changes

Cleanup

This commit is contained in:
Jonathan LaCour 2014-05-27 13:59:27 -07:00
parent 1ca078f3c1
commit 93c44b0daa
21 changed files with 79 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
akanda/__init__.py
View File

@ -1,23 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
#
# 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.
# Copyright 2014 DreamHost, LLC
#
# Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

6
akanda/neutron/__init__.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -13,5 +13,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.

6
akanda/neutron/db/__init__.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -13,5 +13,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.

25
akanda/neutron/db/models_v2.py
View File

@ -1,6 +1,7 @@
# Copyright 2014 DreamHost, LLC # Copyright (c) 2012 OpenStack, LLC.
# Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -15,26 +16,6 @@
# under the License. # under the License.
# Copyright (c) 2012 OpenStack, LLC.
#
# 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.
#
# DreamHost Neutron Extensions
# Copyright 2012 New Dream Network, LLC (DreamHost)
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
from datetime import datetime from datetime import datetime
import netaddr import netaddr

6
akanda/neutron/extensions/__init__.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -13,5 +13,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.

24
akanda/neutron/extensions/_authzbase.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,26 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
import abc import abc
from neutron import quota from neutron import quota

24
akanda/neutron/extensions/addressentry.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,26 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
import logging import logging
from neutron.api import extensions from neutron.api import extensions

23
akanda/neutron/extensions/addressgroup.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -15,25 +15,6 @@
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
from neutron.api import extensions from neutron.api import extensions
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import exceptions from neutron.common import exceptions

24
akanda/neutron/extensions/filterrule.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,26 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
from neutron.api import extensions from neutron.api import extensions
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import exceptions as q_exc from neutron.common import exceptions as q_exc

24
akanda/neutron/extensions/portalias.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,26 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
from neutron.api import extensions from neutron.api import extensions
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import exceptions from neutron.common import exceptions

24
akanda/neutron/extensions/portforward.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,26 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Copyright 2012 New Dream Network, LLC (DreamHost)
#
# 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.
#
# DreamHost Neutron Extensions
# @author: Murali Raju, New Dream Network, LLC (DreamHost)
# @author: Mark Mcclain, New Dream Network, LLC (DreamHost)
from sqlalchemy.orm import exc from sqlalchemy.orm import exc
from neutron.api import extensions from neutron.api import extensions

6
akanda/neutron/plugins/__init__.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -13,5 +13,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.

4
akanda/neutron/plugins/decorators.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

4
akanda/neutron/plugins/floatingip.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

23
akanda/neutron/plugins/nvp_neutron_plugin.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,25 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 New Dream Network, LLC (DreamHost)
# All Rights Reserved
#
# 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.
#
import functools import functools
from neutron.common import topics from neutron.common import topics

23
akanda/neutron/plugins/ovs_neutron_plugin.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -14,25 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 New Dream Network, LLC (DreamHost)
# All Rights Reserved
#
# 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.
#
from neutron.plugins.openvswitch import ovs_neutron_plugin from neutron.plugins.openvswitch import ovs_neutron_plugin
from akanda.neutron.plugins import decorators as akanda from akanda.neutron.plugins import decorators as akanda

92
scripts/rabbit.py
View File

@ -1,6 +1,8 @@
# Copyright 2014 DreamHost, LLC #!/usr/bin/env python
# Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain
@ -15,59 +17,41 @@
# under the License. # under the License.
# Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Usage: python rabbit.py '#'
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may import pika
# not use this file except in compliance with the License. You may obtain import sys
# a copy of the License at credentials = pika.PlainCredentials('guest', 'yetanothersecret')
# connection = pika.BlockingConnection(pika.ConnectionParameters
# http://www.apache.org/licenses/LICENSE-2.0 (host='192.168.57.100',
# credentials=credentials))
# Unless required by applicable law or agreed to in writing, software channel = connection.channel()
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the channel.exchange_declare(exchange='quantum',
# License for the specific language governing permissions and limitations type='topic')
# under the License.
result = channel.queue_declare(exclusive=False)
queue_name = result.method.queue
binding_keys = sys.argv[1:]
if not binding_keys:
print >> sys.stderr, "Usage: %s [binding_key]..." % (sys.argv[0],)
sys.exit(1)
for binding_key in binding_keys:
channel.queue_bind(exchange='quantum',
queue=queue_name,
routing_key=binding_key)
print ' [*] Waiting for logs. To exit press CTRL+C'
#!/usr/bin/env python def callback(ch, method, properties, body):
# print " [x] %r:%r" % (method.routing_key, body,)
# Usage: python rabbit.py '#'
# channel.basic_consume(callback,
import pika queue=queue_name,
import sys no_ack=True)
credentials = pika.PlainCredentials('guest', 'yetanothersecret')
connection = pika.BlockingConnection(pika.ConnectionParameters channel.start_consuming()
(host='192.168.57.100',
credentials=credentials))
channel = connection.channel()
channel.exchange_declare(exchange='quantum',
type='topic')
result = channel.queue_declare(exclusive=False)
queue_name = result.method.queue
binding_keys = sys.argv[1:]
if not binding_keys:
print >> sys.stderr, "Usage: %s [binding_key]..." % (sys.argv[0],)
sys.exit(1)
for binding_key in binding_keys:
channel.queue_bind(exchange='quantum',
queue=queue_name,
routing_key=binding_key)
print ' [*] Waiting for logs. To exit press CTRL+C'
def callback(ch, method, properties, body):
print " [x] %r:%r" % (method.routing_key, body,)
channel.basic_consume(callback,
queue=queue_name,
no_ack=True)
channel.start_consuming()

4
setup.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

4
test/functional/scrubber.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

4
test/functional/visibility.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain

4
test/unit/test_placeholder.py
View File

@ -1,6 +1,6 @@
# Copyright 2014 DreamHost, LLC # Copyright 2014 DreamHost, LLC
# #
# Author: DreamHost, LLC # Author: DreamHost, LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # not use this file except in compliance with the License. You may obtain