FAELIX/gan2ful
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

VLAN tidying time

Browse Source
This commit is contained in:
Marek Isalski
2021-07-25 14:51:31 +01:00
parent 804417481a
commit 4a36c97449
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
g2f-sync
View File

@ -10,7 +10,7 @@ import json
import re import re
resolver = dns.resolver.Resolver() resolver = dns.resolver.Resolver()
vlan_re = re.compile( r"([:\.][0-9]+)" ) vlan_re = re.compile( r"([:\.]?[0-9]+)" )
THINGTYPE_VM = "/api/v2/thingtype/4/" THINGTYPE_VM = "/api/v2/thingtype/4/"
USER_MAREK = "/api/v2/user/1/" USER_MAREK = "/api/v2/user/1/"
@ -69,9 +69,16 @@ def fulcrm_get_thing( uuid = None, source_str = None, source = None, name = None
return ( thing, False ) return ( thing, False )
def ganeti_vlan( val ): def ganeti_vlan( val ):
vlans = { "untagged": None, "tagged": [] }
if val: if val:
return [ x for ( i, x ) in enumerate( vlan_re.split( val ) ) if i % 2 ] for vid in [ x for ( i, x ) in enumerate( vlan_re.split( val ) ) if i % 2 ]:
return None if vid.startswith( ":" ):
vlans[ 'tagged' ].append( int( vid[ 1: ] ) )
elif vid.startswith( "." ):
vlans[ 'untagged' ] = int( vid[ 1: ] )
else:
vlans[ 'untagged' ] = int( vid )
return vlans
def unix_to_8601( t ): def unix_to_8601( t ):
if t: if t: