From 093c8200a102891232e2da166830cd59ee133fc4 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 14 Mar 2011 13:32:22 -0500 Subject: committing to share --- bin/nova-manage | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index b603c8b07..9dc0f4a62 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -505,7 +505,8 @@ class NetworkCommands(object): def create(self, fixed_range=None, num_networks=None, network_size=None, vlan_start=None, - vpn_start=None, fixed_range_v6=None, label='public'): + vpn_start=None, fixed_range_v6=None, label='public', + flat_network_bridge=None): """Creates fixed ips for host by range arguments: [fixed_range=FLAG], [num_networks=FLAG], [network_size=FLAG], [vlan_start=FLAG], @@ -522,6 +523,8 @@ class NetworkCommands(object): vpn_start = FLAGS.vpn_start if not fixed_range_v6: fixed_range_v6 = FLAGS.fixed_range_v6 + if not flat_network_bridge: + flat_network_bridge = FLAGS.flat_network_bridge net_manager = utils.import_object(FLAGS.network_manager) net_manager.create_networks(context.get_admin_context(), cidr=fixed_range, @@ -530,7 +533,8 @@ class NetworkCommands(object): vlan_start=int(vlan_start), vpn_start=int(vpn_start), cidr_v6=fixed_range_v6, - label=label) + label=label, + flat_network_bridge) def list(self): """List all created networks""" -- cgit From 57890776d0d7e9172b1fa056076ce28ae4b34b7b Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 14 Mar 2011 17:54:39 -0500 Subject: added migration to repo --- bin/nova-manage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 9dc0f4a62..dd0f00c85 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -534,7 +534,7 @@ class NetworkCommands(object): vpn_start=int(vpn_start), cidr_v6=fixed_range_v6, label=label, - flat_network_bridge) + bridge=flat_network_bridge) def list(self): """List all created networks""" -- cgit From d4a2a5c34ce568b5d67841c55d3034e93a418507 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Thu, 12 May 2011 16:37:35 -0500 Subject: updated previous calls referring to the flags to use the column from the networks table instead --- bin/nova-manage | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index e19d67c47..c0319fdac 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -517,11 +517,13 @@ class NetworkCommands(object): def create(self, fixed_range=None, num_networks=None, network_size=None, vlan_start=None, vpn_start=None, fixed_range_v6=None, label='public', - flat_network_bridge=None): + flat_network_bridge=None, bridge_interface=None): """Creates fixed ips for host by range arguments: fixed_range=FLAG, [num_networks=FLAG], [network_size=FLAG], [vlan_start=FLAG], - [vpn_start=FLAG], [fixed_range_v6=FLAG]""" + [vpn_start=FLAG], [fixed_range_v6=FLAG], + [label='public'], [flat_network_bridge=FLAG, + [bridge_interface=FLAG]""" if not fixed_range: raise TypeError(_('Fixed range in the form of 10.0.0.0/8 is ' 'required to create networks.')) @@ -537,6 +539,8 @@ class NetworkCommands(object): fixed_range_v6 = FLAGS.fixed_range_v6 if not flat_network_bridge: flat_network_bridge = FLAGS.flat_network_bridge + if not bridge_interface: + bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface net_manager = utils.import_object(FLAGS.network_manager) net_manager.create_networks(context.get_admin_context(), cidr=fixed_range, @@ -546,7 +550,8 @@ class NetworkCommands(object): vpn_start=int(vpn_start), cidr_v6=fixed_range_v6, label=label, - bridge=flat_network_bridge) + bridge=flat_network_bridge, + bridge_interface=bridge_interface) def list(self): """List all created networks""" -- cgit From 7377b010a133d5afa1a20e36b3a1dd2914c461b2 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Thu, 12 May 2011 18:26:46 -0500 Subject: fixed_ip disassociate now also unsets mac_address_id --- bin/nova-manage | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index c0319fdac..6c3561f71 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -171,17 +171,23 @@ class VpnCommands(object): def change(self, project_id, ip, port): """Change the ip and port for a vpn. + this will update all networks associated with a project + not sure if that's the desired behavior or not, patches accepted + args: project, ip, port""" + # TODO(tr3buchet): perhaps this shouldn't update all networks + # associated with a project in the future project = self.manager.get_project(project_id) if not project: print 'No project %s' % (project_id) return - admin = context.get_admin_context() - network_ref = db.project_get_network(admin, project_id) - db.network_update(admin, - network_ref['id'], - {'vpn_public_address': ip, - 'vpn_public_port': int(port)}) + admin_context = context.get_admin_context() + networks = db.project_get_networks(admin_context, project_id) + for network in networks: + db.network_update(admin_context, + network['id'], + {'vpn_public_address': ip, + 'vpn_public_port': int(port)}) class ShellCommands(object): @@ -413,12 +419,13 @@ class ProjectCommands(object): def scrub(self, project_id): """Deletes data associated with project arguments: project_id""" - ctxt = context.get_admin_context() - network_ref = db.project_get_network(ctxt, project_id) - db.network_disassociate(ctxt, network_ref['id']) - groups = db.security_group_get_by_project(ctxt, project_id) + admin_context = context.get_admin_context() + networks = db.project_get_networks(admin_context, project_id) + for network in networks: + db.network_disassociate(admin_context, network['id']) + groups = db.security_group_get_by_project(admin_context, project_id) for group in groups: - db.security_group_destroy(ctxt, group['id']) + db.security_group_destroy(admin_context, group['id']) def zipfile(self, project_id, user_id, filename='nova.zip'): """Exports credentials for project to a zip file -- cgit From 93d76ba4706d1093965bd0690de24ee819cef1a4 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 16 May 2011 14:50:26 -0500 Subject: using mac_address from fixed_ip instead of instance --- bin/nova-manage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 6c3561f71..8e2a49ef2 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -476,7 +476,7 @@ class FixedIpCommands(object): instance = fixed_ip['instance'] hostname = instance['hostname'] host = instance['host'] - mac_address = instance['mac_address'] + mac_address = fixed_ip['mac_address']['address'] print "%-18s\t%-15s\t%-17s\t%-15s\t%s" % ( fixed_ip['network']['cidr'], fixed_ip['address'], -- cgit From d7925b3890f651b3f6fd002a45b2add86e388d10 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Wed, 8 Jun 2011 14:46:31 -0500 Subject: updated docstring for nova-manage network create --- bin/nova-manage | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index e7164b4d2..187db0c86 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -562,6 +562,9 @@ class NetworkCommands(object): [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG], [fixed_range_v6=FLAG], [gateway_v6=FLAG], [flat_network_bridge=FLAG], [bridge_interface=FLAG] + If you wish to use a later argument fill in the gaps with 0s + Ex: network create private 10.0.0.0/8 1 15 0 0 0 0 xenbr1 eth1 + network create private 10.0.0.0/8 1 15 """ if not label: msg = _('a label (ex: public) is required to create networks.') -- cgit From 878468db557b4498528d57804a1808388d7993ec Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 10 Jun 2011 16:55:27 -0500 Subject: floating ips can now move around the network hosts --- bin/nova-manage | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 187db0c86..16b0cd1dd 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -518,13 +518,12 @@ class FixedIpCommands(object): class FloatingIpCommands(object): """Class for managing floating ip.""" - def create(self, host, range): - """Creates floating ips for host by range - arguments: host ip_range""" + def create(self, range): + """Creates floating ips for zone by range + arguments: ip_range""" for address in IPy.IP(range): db.floating_ip_create(context.get_admin_context(), - {'address': str(address), - 'host': host}) + {'address': str(address)}) def delete(self, ip_range): """Deletes floating ips by range @@ -535,7 +534,8 @@ class FloatingIpCommands(object): def list(self, host=None): """Lists all floating ips (optionally by host) - arguments: [host]""" + arguments: [host] + Note: if host is given, only active floating IPs are returned""" ctxt = context.get_admin_context() if host is None: floating_ips = db.floating_ip_get_all(ctxt) -- cgit From b699b9abd235eb611bc1d59b923f1ed83f96cfff Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 27 Jun 2011 17:07:21 -0500 Subject: removed unneded mac parameter to lease and release fixed ip functions --- bin/nova-dhcpbridge | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 5926b97de..6d9d85896 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -59,14 +59,12 @@ def add_lease(mac, ip_address, _hostname, _interface): LOG.debug(_("leasing ip")) network_manager = utils.import_object(FLAGS.network_manager) network_manager.lease_fixed_ip(context.get_admin_context(), - mac, ip_address) else: rpc.cast(context.get_admin_context(), "%s.%s" % (FLAGS.network_topic, FLAGS.host), {"method": "lease_fixed_ip", - "args": {"mac": mac, - "address": ip_address}}) + "args": {"address": ip_address}}) def old_lease(mac, ip_address, hostname, interface): @@ -81,14 +79,12 @@ def del_lease(mac, ip_address, _hostname, _interface): LOG.debug(_("releasing ip")) network_manager = utils.import_object(FLAGS.network_manager) network_manager.release_fixed_ip(context.get_admin_context(), - mac, ip_address) else: rpc.cast(context.get_admin_context(), "%s.%s" % (FLAGS.network_topic, FLAGS.host), {"method": "release_fixed_ip", - "args": {"mac": mac, - "address": ip_address}}) + "args": {"address": ip_address}}) def init_leases(interface): -- cgit