X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Futil%2Fspecdict.py;h=8f0b59713e204dd1090d74fb4318fb0a09511363;hb=13f21256ad2bb27c6e5b6da10c2257e54b45e433;hp=2036977bddb6de1564928d90183ba6ff10197c5a;hpb=1d53363bdbaecfeefc63275c268dd60ea3167fcf;p=sfa.git diff --git a/geni/util/specdict.py b/geni/util/specdict.py index 2036977b..8f0b5971 100644 --- a/geni/util/specdict.py +++ b/geni/util/specdict.py @@ -69,16 +69,24 @@ class IfSpecDict(SpecDict): 'type': 'type'} class LinkSpecDict(SpecDict): - type = 'IfSpec' - fields = {'name': '', - 'addr': '', - 'type': '', + type = 'LinkSpec' + fields = {'min_alloc': '', + 'max_alloc': '', + 'type': '', + 'start_time': '', + 'bw': '', + 'duration': '', 'init_params': '', - 'min_rate': '', - 'max_rate': '', - 'max_kbyte': ''} - plc_fields = {} - + 'endpoints': [IfSpecDict]} + plc_fields = {'min_alloc': 'min_alloc', + 'max_alloc': 'max_alloc', + 'type': 'type', + 'start_time': 'start_time', + 'bw': 'bw', + 'duration': 'duration', + 'init_params': 'init_params', + 'endpoints': 'endpoints'} + class NodeSpecDict(SpecDict): type = 'NodeSpec'