Преглед на файлове

Rename 'net/*' features to 'net.*'

Same reasoning as with 'service/*' - '/' is not allowed in qrexec (so
Admin API) call argument.

Related to QubesOS/qubes-issues#2906
Marek Marczykowski-Górecki преди 6 години
родител
ревизия
801d6acf5c
променени са 2 файла, в които са добавени 16 реда и са изтрити 16 реда
  1. 13 13
      qubes/tests/integ/network.py
  2. 3 3
      qubes/vm/mix/net.py

+ 13 - 13
qubes/tests/integ/network.py

@@ -350,9 +350,9 @@ class VmNetworkingMixin(object):
 
     def test_200_fake_ip_simple(self):
         '''Test hiding VM real IP'''
-        self.testvm1.features['net/fake-ip'] = '192.168.1.128'
-        self.testvm1.features['net/fake-gateway'] = '192.168.1.1'
-        self.testvm1.features['net/fake-netmask'] = '255.255.255.0'
+        self.testvm1.features['net.fake-ip'] = '192.168.1.128'
+        self.testvm1.features['net.fake-gateway'] = '192.168.1.1'
+        self.testvm1.features['net.fake-netmask'] = '255.255.255.0'
         self.app.save()
         self.loop.run_until_complete(self.testvm1.start())
         self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
@@ -381,7 +381,7 @@ class VmNetworkingMixin(object):
 
     def test_201_fake_ip_without_gw(self):
         '''Test hiding VM real IP'''
-        self.testvm1.features['net/fake-ip'] = '192.168.1.128'
+        self.testvm1.features['net.fake-ip'] = '192.168.1.128'
         self.app.save()
         self.loop.run_until_complete(self.testvm1.start())
         self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0)
@@ -400,9 +400,9 @@ class VmNetworkingMixin(object):
 
     def test_202_fake_ip_firewall(self):
         '''Test hiding VM real IP, firewall'''
-        self.testvm1.features['net/fake-ip'] = '192.168.1.128'
-        self.testvm1.features['net/fake-gateway'] = '192.168.1.1'
-        self.testvm1.features['net/fake-netmask'] = '255.255.255.0'
+        self.testvm1.features['net.fake-ip'] = '192.168.1.128'
+        self.testvm1.features['net.fake-gateway'] = '192.168.1.1'
+        self.testvm1.features['net.fake-netmask'] = '255.255.255.0'
 
         self.proxy = self.app.add_new_vm(qubes.vm.appvm.AppVM,
             name=self.make_vm_name('proxy'),
@@ -462,9 +462,9 @@ class VmNetworkingMixin(object):
         self.proxy.provides_network = True
         self.proxy.netvm = self.testnetvm
         self.testvm1.netvm = self.proxy
-        self.testvm1.features['net/fake-ip'] = '192.168.1.128'
-        self.testvm1.features['net/fake-gateway'] = '192.168.1.1'
-        self.testvm1.features['net/fake-netmask'] = '255.255.255.0'
+        self.testvm1.features['net.fake-ip'] = '192.168.1.128'
+        self.testvm1.features['net.fake-gateway'] = '192.168.1.1'
+        self.testvm1.features['net.fake-netmask'] = '255.255.255.0'
 
         self.testvm2 = self.app.add_new_vm(qubes.vm.appvm.AppVM,
             name=self.make_vm_name('vm3'),
@@ -512,9 +512,9 @@ class VmNetworkingMixin(object):
         self.loop.run_until_complete(self.proxy.create_on_disk())
         self.proxy.provides_network = True
         self.proxy.netvm = self.testnetvm
-        self.proxy.features['net/fake-ip'] = '192.168.1.128'
-        self.proxy.features['net/fake-gateway'] = '192.168.1.1'
-        self.proxy.features['net/fake-netmask'] = '255.255.255.0'
+        self.proxy.features['net.fake-ip'] = '192.168.1.128'
+        self.proxy.features['net.fake-gateway'] = '192.168.1.1'
+        self.proxy.features['net.fake-netmask'] = '255.255.255.0'
         self.testvm1.netvm = self.proxy
         self.app.save()
         self.loop.run_until_complete(self.testvm1.start())

+ 3 - 3
qubes/vm/mix/net.py

@@ -117,19 +117,19 @@ class NetVMMixin(qubes.events.Emitter):
     @qubes.stateless_property
     def visible_ip(self):
         '''IP address of this domain as seen by the domain.'''
-        return self.features.check_with_template('net/fake-ip', None) or \
+        return self.features.check_with_template('net.fake-ip', None) or \
             self.ip
 
     @qubes.stateless_property
     def visible_gateway(self):
         '''Default gateway of this domain as seen by the domain.'''
-        return self.features.check_with_template('net/fake-gateway', None) or \
+        return self.features.check_with_template('net.fake-gateway', None) or \
             self.netvm.gateway
 
     @qubes.stateless_property
     def visible_netmask(self):
         '''Netmask as seen by the domain.'''
-        return self.features.check_with_template('net/fake-netmask', None) or \
+        return self.features.check_with_template('net.fake-netmask', None) or \
             self.netvm.netmask
 
     #