1) Created a DummDataPlugin in SamplePlugin module.
- DummyDataPlugin is a sligh improvment over QuantumEchoPlugin in that the plugin returns hard-coded data structures. 2) Created a CLI that enabled quantum plugin writers to test their plug-in implementation. - Currently I am using DummyDataPlugin to test and run the CLI but if anybody has another better Quantum plug-in, please modify manager.py to use your plug-in and drive the plug-in using the CLI. - Running the CLI against wider variety of plug-ins will help the CLI evolve and improve. Please free to send patches. 3) TODO: list - Finalize the plug-in data model - Finalize the exception and make the plug-in throw exceptions - Write unit tests for plug-in qualification and CLI testing.
This commit is contained in:
parent
1290f3a0e0
commit
c7e632d3f9
|
@ -0,0 +1,98 @@
|
|||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2011, Nicira Networks, Inc.
|
||||
#
|
||||
# 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.
|
||||
# @author: Somik Behera, Nicira Networks, Inc.
|
||||
|
||||
import sys
|
||||
|
||||
from manager import QuantumManager
|
||||
|
||||
|
||||
def usage():
|
||||
print "\nUsage:"
|
||||
print "list_nets <tenant-id>"
|
||||
print "create_net <tenant-id> <net-name>"
|
||||
print "delete_net <tenant-id> <net-id>"
|
||||
print "detail_net <tenant-id> <net-id>"
|
||||
print "rename_net <tenant-id> <net-id> <new name>"
|
||||
print "list_ports <tenant-id> <net-id>"
|
||||
print "create_port <tenant-id> <net-id>"
|
||||
print "delete_port <tenant-id> <net-id> <port-id>"
|
||||
print "detail_port <tenant-id> <net-id> <port-id>"
|
||||
print "plug_iface <tenant-id> <net-id> <port-id> <iface-id>"
|
||||
print "unplug_iface <tenant-id> <net-id> <port-id>"
|
||||
print "detail_iface <tenant-id> <net-id> <port-id>"
|
||||
print "list_iface <tenant-id> <net-id>\n"
|
||||
|
||||
if len(sys.argv) < 2 or len(sys.argv) > 6:
|
||||
usage()
|
||||
exit(1)
|
||||
|
||||
quantum = QuantumManager()
|
||||
manager = quantum.get_manager()
|
||||
|
||||
if sys.argv[1] == "list_nets" and len(sys.argv) == 3:
|
||||
network_on_tenant = manager.get_all_networks(sys.argv[2])
|
||||
print "Virtual Networks on Tenant:%s\n" % sys.argv[2]
|
||||
for k, v in network_on_tenant.iteritems():
|
||||
print"\tNetwork ID:%s \n\tNetwork Name:%s \n" % (k, v)
|
||||
elif sys.argv[1] == "create_net" and len(sys.argv) == 4:
|
||||
new_net_id = manager.create_network(sys.argv[2], sys.argv[3])
|
||||
print "Created a new Virtual Network with ID:%s\n" % new_net_id
|
||||
elif sys.argv[1] == "delete_net" and len(sys.argv) == 4:
|
||||
manager.delete_network(sys.argv[2], sys.argv[3])
|
||||
print "Deleted Virtual Network with ID:%s" % sys.argv[3]
|
||||
elif sys.argv[1] == "detail_net" and len(sys.argv) == 4:
|
||||
vif_list = manager.get_network_details(sys.argv[2], sys.argv[3])
|
||||
print "Remote Interfaces on Virtual Network:%s\n" % sys.argv[3]
|
||||
for iface in vif_list:
|
||||
print "\tRemote interface :%s" % iface
|
||||
elif sys.argv[1] == "rename_net" and len(sys.argv) == 5:
|
||||
manager.rename_network(sys.argv[2], sys.argv[3], sys.argv[4])
|
||||
print "Renamed Virtual Network with ID:%s" % sys.argv[3]
|
||||
elif sys.argv[1] == "list_ports" and len(sys.argv) == 4:
|
||||
ports = manager.get_all_ports(sys.argv[2], sys.argv[3])
|
||||
print " Virtual Ports on Virtual Network:%s\n" % sys.argv[3]
|
||||
for port in ports:
|
||||
print "\tVirtual Port:%s" % port
|
||||
elif sys.argv[1] == "create_port" and len(sys.argv) == 4:
|
||||
new_port = manager.create_port(sys.argv[2], sys.argv[3])
|
||||
print "Created Virtual Port:%s on Virtual Network:%s" % (new_port, sys.argv[3])
|
||||
elif sys.argv[1] == "delete_port" and len(sys.argv) == 5:
|
||||
manager.delete_port(sys.argv[2], sys.argv[3], sys.argv[4])
|
||||
print "Deleted Virtual Port:%s on Virtual Network:%s" % (sys.argv[3], sys.argv[4])
|
||||
elif sys.argv[1] == "detail_port" and len(sys.argv) == 5:
|
||||
port_detail = manager.get_port_details(sys.argv[2], sys.argv[3], sys.argv[4])
|
||||
print "Virtual Port:%s on Virtual Network:%s contains remote interface:%s" % (sys.argv[3], sys.argv[4], port_detail)
|
||||
elif sys.argv[1] == "plug_iface" and len(sys.argv) == 6:
|
||||
manager.plug_interface(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])
|
||||
print "Plugged remote interface:%s into Virtual Network:%s" % (sys.argv[5], sys.argv[3])
|
||||
elif sys.argv[1] == "unplug_iface" and len(sys.argv) == 5:
|
||||
manager.unplug_interface(sys.argv[2], sys.argv[3], sys.argv[4])
|
||||
print "UnPlugged remote interface from Virtual Port:%s Virtual Network:%s" % (sys.argv[4], sys.argv[3])
|
||||
elif sys.argv[1] == "detail_iface" and len(sys.argv) == 5:
|
||||
remote_iface = manager.get_interface_details(sys.argv[2], sys.argv[3], sys.argv[4])
|
||||
print "Remote interface on Virtual Port:%s Virtual Network:%s is %s" % (sys.argv[4], sys.argv[3], remote_iface)
|
||||
elif sys.argv[1] == "list_iface" and len(sys.argv) == 4:
|
||||
iface_list = manager.get_all_attached_interfaces(sys.argv[2], sys.argv[3])
|
||||
print "Remote Interfaces on Virtual Network:%s\n" % sys.argv[3]
|
||||
for iface in iface_list:
|
||||
print "\tRemote interface :%s" % iface
|
||||
elif sys.argv[1] == "all" and len(sys.argv) == 2:
|
||||
print "Not Implemented"
|
||||
else:
|
||||
print "invalid arguments: %s" % str(sys.argv)
|
||||
usage()
|
||||
|
|
@ -37,12 +37,12 @@ class QuantumManager(object):
|
|||
# configuration file as opposed to hard-coding the location
|
||||
#
|
||||
#plugin_location = get_plugin_location(configuration_file)
|
||||
plugin_location = "plugins.SamplePlugin.QuantumEchoPlugin"
|
||||
plugin_location = "plugins.SamplePlugin.DummyDataPlugin"
|
||||
plugin_klass = utils.import_class(plugin_location)
|
||||
if not issubclass(plugin_klass, QuantumPluginBase):
|
||||
raise Exception("Imported plugin didn't pass compatibility test")
|
||||
raise Exception("Configured Quantum plug-in didn't pass compatibility test")
|
||||
else:
|
||||
print("Imported plugin passed compatibility test\n")
|
||||
print("Successfully imported Quantum plug-in. All compatibility tests passed\n")
|
||||
self.plugin = plugin_klass()
|
||||
|
||||
def get_manager(self):
|
||||
|
|
|
@ -129,3 +129,134 @@ class QuantumEchoPlugin(object):
|
|||
a particular Virtual Network.
|
||||
"""
|
||||
print("get_all_attached_interfaces() called\n")
|
||||
|
||||
class DummyDataPlugin(object):
|
||||
|
||||
"""
|
||||
DummyDataPlugin is a demo plugin that provides
|
||||
hard-coded data structures to aid in quantum
|
||||
client/cli development
|
||||
"""
|
||||
|
||||
def get_all_networks(self, tenant_id):
|
||||
"""
|
||||
Returns a dictionary containing all
|
||||
<network_uuid, network_name> for
|
||||
the specified tenant.
|
||||
"""
|
||||
nets = {"001": "lNet1", "002": "lNet2" , "003": "lNet3"}
|
||||
print("get_all_networks() called\n")
|
||||
return nets
|
||||
|
||||
|
||||
def create_network(self, tenant_id, net_name):
|
||||
"""
|
||||
Creates a new Virtual Network, and assigns it
|
||||
a symbolic name.
|
||||
"""
|
||||
print("create_network() called\n")
|
||||
# return network_id of the created network
|
||||
return 101
|
||||
|
||||
|
||||
def delete_network(self, tenant_id, net_id):
|
||||
"""
|
||||
Deletes the network with the specified network identifier
|
||||
belonging to the specified tenant.
|
||||
"""
|
||||
print("delete_network() called\n")
|
||||
|
||||
|
||||
def get_network_details(self, tenant_id, net_id):
|
||||
"""
|
||||
retrieved a list of all the remote vifs that
|
||||
are attached to the network
|
||||
"""
|
||||
print("get_network_details() called\n")
|
||||
vifs_on_net = ["/tenant1/networks/net_id/portid/vif2.0", "/tenant1/networks/10/121/vif1.1"]
|
||||
return vifs_on_net
|
||||
|
||||
|
||||
def rename_network(self, tenant_id, net_id, new_name):
|
||||
"""
|
||||
Updates the symbolic name belonging to a particular
|
||||
Virtual Network.
|
||||
"""
|
||||
print("rename_network() called\n")
|
||||
|
||||
|
||||
def get_all_ports(self, tenant_id, net_id):
|
||||
"""
|
||||
Retrieves all port identifiers belonging to the
|
||||
specified Virtual Network.
|
||||
"""
|
||||
print("get_all_ports() called\n")
|
||||
port_ids_on_net = ["2", "3", "4"]
|
||||
return port_ids_on_net
|
||||
|
||||
|
||||
def create_port(self, tenant_id, net_id):
|
||||
"""
|
||||
Creates a port on the specified Virtual Network.
|
||||
"""
|
||||
print("create_port() called\n")
|
||||
#return the port id
|
||||
return 201
|
||||
|
||||
|
||||
def delete_port(self, tenant_id, net_id, port_id):
|
||||
"""
|
||||
Deletes a port on a specified Virtual Network,
|
||||
if the port contains a remote interface attachment,
|
||||
the remote interface is first un-plugged and then the port
|
||||
is deleted.
|
||||
"""
|
||||
print("delete_port() called\n")
|
||||
|
||||
|
||||
def get_port_details(self, tenant_id, net_id, port_id):
|
||||
"""
|
||||
This method allows the user to retrieve a remote interface
|
||||
that is attached to this particular port.
|
||||
"""
|
||||
print("get_port_details() called\n")
|
||||
#returns the remote interface UUID
|
||||
return "/tenant1/networks/net_id/portid/vif2.1"
|
||||
|
||||
|
||||
def plug_interface(self, tenant_id, net_id, port_id, remote_interface_id):
|
||||
"""
|
||||
Attaches a remote interface to the specified port on the
|
||||
specified Virtual Network.
|
||||
"""
|
||||
print("plug_interface() called\n")
|
||||
|
||||
|
||||
def unplug_interface(self, tenant_id, net_id, port_id):
|
||||
"""
|
||||
Detaches a remote interface from the specified port on the
|
||||
specified Virtual Network.
|
||||
"""
|
||||
print("unplug_interface() called\n")
|
||||
|
||||
|
||||
def get_interface_details(self, tenant_id, net_id, port_id):
|
||||
"""
|
||||
Retrieves the remote interface that is attached at this
|
||||
particular port.
|
||||
"""
|
||||
print("get_interface_details() called\n")
|
||||
#returns the remote interface UUID
|
||||
return "/tenant1/networks/net_id/portid/vif2.0"
|
||||
|
||||
|
||||
def get_all_attached_interfaces(self, tenant_id, net_id):
|
||||
"""
|
||||
Retrieves all remote interfaces that are attached to
|
||||
a particular Virtual Network.
|
||||
"""
|
||||
print("get_all_attached_interfaces() called\n")
|
||||
# returns a list of all attached remote interfaces
|
||||
vifs_on_net = ["/tenant1/networks/net_id/portid/vif2.0", "/tenant1/networks/10/121/vif1.1"]
|
||||
return vifs_on_net
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2011, Nicira Networks, Inc.
|
||||
#
|
||||
# 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.
|
||||
# @author: Somik Behera, Nicira Networks, Inc.
|
||||
|
||||
from manager import QuantumManager
|
||||
|
||||
class CLI():
|
||||
|
||||
def index(self):
|
||||
pass
|
||||
|
||||
def main():
|
||||
quantum = QuantumManager()
|
||||
manager = quantum.get_manager()
|
||||
manager.get_all_networks("tesst")
|
||||
#print("is a plugin")
|
||||
|
||||
# Standard boilerplate to call the main() function.
|
||||
if __name__ == '__main__':
|
||||
main()
|
|
@ -57,8 +57,8 @@ class QuantumPluginBase(object):
|
|||
@abstractmethod
|
||||
def get_network_details(self, tenant_id, net_id):
|
||||
"""
|
||||
Deletes the Virtual Network belonging to a the
|
||||
spec
|
||||
retrieved a list of all the remote vifs that
|
||||
are attached to the network
|
||||
"""
|
||||
pass
|
||||
|
||||
|
|
Loading…
Reference in New Issue