j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-10-31 19:44:16 +00:00
Code Issues Projects Releases Wiki Activity

instance/network: allow to select compute interface, previously only compute network

Browse source
This commit is contained in:
Ing. Jan KRCMAR 2018-08-28 12:18:35 +02:00
parent 9c37dcc2dc
commit b4da655644
4 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
instances/templates/add_instance_network_block.html
View file

@ -25,7 +25,10 @@
<div class="col-sm-6">
<select class="form-control" name="add-net-network">
{% for c_net in compute_networks %}
<option value="{{ c_net }}">{{ c_net }}</option>
<option value="net:{{ c_net }}">Network {{ c_net }}</option>
{% endfor %}
{% for c_iface in compute_interfaces %}
<option value="iface:{{ c_iface }}">Interface {{ c_iface }}</option>
{% endfor %}
</select>
</div>

7
instances/templates/instance.html
View file

@ -846,9 +846,12 @@
<select name="net-source-{{ forloop.counter0 }}" class="form-control" id="network_select" onchange="network_select_enable()">
{% for c_nets in compute_networks %}
{% if forloop.counter0 == 0 %}
<option value="{{ network.nic }}" selected hidden>{% trans "to Change" %}</option>
<option value="iface:{{ network.nic }}" selected hidden>{% trans "to Change" %}</option>
{% endif %}
<option value="{{ c_nets }}">{{ c_nets }}</option>
<option value="net:{{ c_nets }}">Network {{ c_nets }}</option>
{% endfor %}
{% for c_iface in compute_interfaces %}
<option value="iface:{{ c_iface }}">Interface {{ c_iface }}</option>
{% endfor %}
</select>
</div>

18
instances/views.py
View file

@ -321,6 +321,13 @@ def instance(request, compute_id, vname):
if dev not in existing_devs:
return dev
raise Exception(_('None available device name'))
def get_network_tuple(network_source_str):
network_source_pack = network_source_str.split(":", 1)
if len(network_source_pack) > 1:
return (network_source_pack[1], network_source_pack[0])
else:
return (network_source_pack[0], 'net')
try:
conn = wvmInstance(compute.hostname,
@ -329,6 +336,7 @@ def instance(request, compute_id, vname):
compute.type,
vname)
compute_networks = sorted(conn.get_networks())
compute_interfaces = sorted(conn.get_ifaces())
status = conn.get_status()
autostart = conn.get_autostart()
vcpu = conn.get_vcpu()
@ -686,7 +694,11 @@ def instance(request, compute_id, vname):
network_data = {}
for post in request.POST:
if post.startswith('net-'):
if post.startswith('net-source-'):
(source, source_type) = get_network_tuple(request.POST.get(post))
network_data[post] = source
network_data[post + '-type'] = source_type
elif post.startswith('net-'):
network_data[post] = request.POST.get(post, '')
conn.change_network(network_data)
@ -698,9 +710,9 @@ def instance(request, compute_id, vname):
if 'add_network' in request.POST:
mac = request.POST.get('add-net-mac')
network = request.POST.get('add-net-network')
(source, source_type) = get_network_tuple(request.POST.get('add-net-network'))
conn.add_network(mac, network)
conn.add_network(mac, source, source_type)
msg = _("Edit network")
addlogmsg(request.user.username, instance.name, msg)
msg = _("Network Devices are changed. Please reboot instance to activate.")

25
vrtManager/instance.py
View file

@ -742,16 +742,25 @@ class wvmInstance(wvmConnect):
return self.get_instance(clone_data['name']).UUIDString()
def add_network(self, mac_address, network, interface_type='bridge', model='virtio'):
def get_bridge_name(self, source, source_type='net'):
if source_type == 'iface':
iface = self.get_iface(source)
bridge_name = iface.name()
else:
net = self.get_network(source)
bridge_name = net.bridgeName()
return bridge_name
def add_network(self, mac_address, source, source_type='net', interface_type='bridge', model='virtio'):
tree = ElementTree.fromstring(self._XMLDesc(0))
net = self.get_network(network)
bridge_name = self.get_bridge_name(source, source_type)
xml_interface = """
<interface type='%s'>
<mac address='%s'/>
<source bridge='%s'/>
<model type='%s'/>
</interface>
""" % (interface_type, mac_address, net.bridgeName(), model)
""" % (interface_type, mac_address, bridge_name, model)
if self.get_status() == 5:
devices = tree.find('devices')
elm_interface = ElementTree.fromstring(xml_interface)
@ -764,13 +773,15 @@ class wvmInstance(wvmConnect):
tree = ElementTree.fromstring(xml)
for num, interface in enumerate(tree.findall('devices/interface')):
net = self.get_network(network_data['net-source-' + str(num)])
net_source = network_data['net-source-' + str(num)]
net_source_type = network_data['net-source-' + str(num) + '-type']
net_mac = network_data['net-mac-' + str(num)]
bridge_name = self.get_bridge_name(net_source, net_source_type)
if interface.get('type') == 'bridge':
source = interface.find('mac')
source.set('address', network_data['net-mac-' + str(num)])
source.set('address', net_mac)
source = interface.find('source')
source.set('bridge', net.bridgeName())
source.set('network', net.name())
source.set('bridge', bridge_name)
new_xml = ElementTree.tostring(tree)
self._defineXML(new_xml)