Mentions légales du service

Skip to content
Snippets Groups Projects

Fix dns discovery

Merged SIMONIN Matthieu requested to merge msimonin/enoslib:to_pyg5k-resa2 into to_pyg5k
1 file
+ 25
16
Compare changes
  • Side-by-side
  • Inline
@@ -24,7 +24,16 @@ logger = logging.getLogger(__name__)
@@ -24,7 +24,16 @@ logger = logging.getLogger(__name__)
NATURE_PROD = "prod"
NATURE_PROD = "prod"
SYNCHRONISATION_OFFSET = 60
SYNCHRONISATION_OFFSET = 60
G5KMACPREFIX = '00:16:3E'
G5KMACPREFIX = '00:16:3E'
DNS = {
 
"grenoble": "172.16.31.110",
 
"lille": "172.16.47.101",
 
"luxembourg": "172.16.191.101",
 
"lyon": "172.16.63.113",
 
"nancy": "172.16.79.106",
 
"nantes": "172.16.207.101",
 
"rennes": "172.16.111.118",
 
"sophia": "172.16.143.101",
 
}
class ConcreteNetwork:
class ConcreteNetwork:
def __init__(self, *,
def __init__(self, *,
@@ -39,7 +48,8 @@ class ConcreteNetwork:
@@ -39,7 +48,8 @@ class ConcreteNetwork:
self.site = site
self.site = site
self.network = network
self.network = network
self.gateway = gateway
self.gateway = gateway
self.dns = dns
# NOTE(msimonin): dns info isn't present in g5k api
 
self.dns = DNS[site]
self.vlan_id = vlan_id
self.vlan_id = vlan_id
self.ipmac = []
self.ipmac = []
if ipmac is not None:
if ipmac is not None:
@@ -52,20 +62,19 @@ class ConcreteNetwork:
@@ -52,20 +62,19 @@ class ConcreteNetwork:
return n_type
return n_type
def __repr__(self):
def __repr__(self):
return """<ConcreteNetwork
return ("<ConcreteNetwork site=%s"
site=%s
" nature=%s"
nature=%s
" network=%s"
network=%s
" gateway=%s"
gateway=%s
" dns=%s"
dns=%s
" vlan_id=%s>") % (
vlan_id=%s>""" % (
self.site,
self.site,
self.nature,
self.nature,
self.network,
self.network,
self.gateway,
self.gateway,
self.dns,
self.dns,
self.vlan_id
self.vlan_id
)
)
class ConcreteSubnet(ConcreteNetwork):
class ConcreteSubnet(ConcreteNetwork):
Loading