diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-09 15:50:48 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-09 15:50:48 +0000 |
| commit | 24f133ff269e0a240c081d6c93028a17a555e5c4 (patch) | |
| tree | 4b1d257f869bbb284ba4203756ca0fd2fe0dabbd | |
| parent | d689e9ce44ab7d7a07c4195fe6fc28289f7c5654 (diff) | |
Cheap hack to get testbed.py to stop using testpoke.py, now that rpkid
supports hosting and we don't have to run a separate rpkid for each
entity in the system.
testbed.py "yaml client" (testpoke) code should be ripped out entirely
at some point and the surrounding code rewritten, but it's not urgent.
svn path=/rpkid/testbed.2.yaml; revision=2509
| -rw-r--r-- | rpkid/testbed.2.yaml | 21 | ||||
| -rw-r--r-- | rpkid/testbed.py | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/rpkid/testbed.2.yaml b/rpkid/testbed.2.yaml index 76d5af6b..0cdec650 100644 --- a/rpkid/testbed.2.yaml +++ b/rpkid/testbed.2.yaml @@ -34,67 +34,86 @@ kids: - name: R0 kids: - name: Alice + hosted_by: R0 ipv4: 192.0.2.1-192.0.2.33 asn: 64533 - name: Bob + hosted_by: R0 ipv4: 192.0.2.44-192.0.2.100 - name: R1 kids: - name: Carol + hosted_by: R1 ipv6: 2001:db8::44-2001:db8::100 - name: Dave + hosted_by: R1 ipv6: 2001:db8::10:0:44/128 asn: 64544 - name: R2 kids: - name: Elena + hosted_by: R2 ipv4: 10.0.0.0/24 ipv6: 2001:db8::a00:0/120 - name: Frank + hosted_by: R2 ipv4: 10.3.0.0/24 ipv6: 2001:db8::a03:0/120 - name: R3 kids: - name: Ginny + hosted_by: R3 asn: 64534-64540 - name: Harry + hosted_by: R3 asn: 666-677 - hosted_by: R1 - name: R4 kids: - name: Ilse + hosted_by: R4 ipv4: 10.3.0.0/16 - name: Jack + hosted_by: R4 ipv4: 10.2.0.0/16 - name: R5 kids: - name: Kari + hosted_by: R5 asn: 222-233 - name: Leon + hosted_by: R5 asn: 244-255 - name: R6 kids: - name: Mary + hosted_by: R6 ipv4: 10.77.0.0/16 - name: Neal + hosted_by: R6 ipv4: 10.66.0.0/16 - name: R7 kids: - name: Olga + hosted_by: R7 ipv4: 10.88.0.0/16 - name: Piet + hosted_by: R7 ipv4: 10.99.0.0/16 - name: R8 kids: - name: Qi + hosted_by: R8 asn: 111-122 - name: Rex + hosted_by: R8 asn: 333-344 - name: R9 kids: - name: Sandra + hosted_by: R9 asn: 555-566 - name: Thad + hosted_by: R9 asn: 577-588 --- - name: Alice diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 01cd8601..1c942423 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -590,7 +590,8 @@ class allocation(object): return s + "Until: %s\n" % self.resources.valid_until def is_leaf(self): - return not self.kids and not self.route_origins + #return not self.kids and not self.route_origins + return False def is_root(self): return self.parent is None |