diff options
Diffstat (limited to 'ca')
| -rw-r--r-- | ca/tests/smoketest.py | 6 | ||||
| -rw-r--r-- | ca/tests/yamlconf.py | 12 | ||||
| -rwxr-xr-x | ca/tests/yamltest.py | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py index 9d82c640..6479883e 100644 --- a/ca/tests/smoketest.py +++ b/ca/tests/smoketest.py @@ -537,9 +537,9 @@ class allocation(object): if valid_until is None and "valid_for" in yaml: valid_until = rpki.sundial.now() + rpki.sundial.timedelta.parse(yaml["valid_for"]) self.base = rpki.resource_set.resource_bag( - asn = rpki.resource_set.resource_set_as(yaml.get("asn")), - v4 = rpki.resource_set.resource_set_ipv4(yaml.get("ipv4")), - v6 = rpki.resource_set.resource_set_ipv6(yaml.get("ipv6")), + asn = str(yaml.get("asn", "")), + v4 = yaml.get("ipv4"), + v6 = yaml.get("ipv6"), valid_until = valid_until) self.sia_base = yaml.get("sia_base") if "crl_interval" in yaml: diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py index 52c4da26..08827acd 100644 --- a/ca/tests/yamlconf.py +++ b/ca/tests/yamlconf.py @@ -218,9 +218,9 @@ class allocation(object): if valid_until is None and "valid_for" in y: valid_until = rpki.sundial.now() + rpki.sundial.timedelta.parse(y["valid_for"]) self.base = rpki.resource_set.resource_bag( - asn = rpki.resource_set.resource_set_as(y.get("asn")), - v4 = rpki.resource_set.resource_set_ipv4(y.get("ipv4")), - v6 = rpki.resource_set.resource_set_ipv6(y.get("ipv6")), + asn = str(y.get("asn", "")), + v4 = y.get("ipv4"), + v6 = y.get("ipv6"), valid_until = valid_until) if "crl_interval" in y: self.crl_interval = rpki.sundial.timedelta.parse(y["crl_interval"]).convert_to_seconds() @@ -514,9 +514,9 @@ class allocation(object): assert self.is_root and not self.is_hosted root_resources = rpki.resource_set.resource_bag( - asn = rpki.resource_set.resource_set_as("0-4294967295"), - v4 = rpki.resource_set.resource_set_ipv4("0.0.0.0/0"), - v6 = rpki.resource_set.resource_set_ipv6("::/0")) + asn = "0-4294967295", + v4 = "0.0.0.0/0", + v6 = "::/0") root_key = rpki.x509.RSA.generate(quiet = True) diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index 38b5bdac..d413df5c 100755 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -244,9 +244,9 @@ class allocation(object): if valid_until is None and "valid_for" in yaml: valid_until = rpki.sundial.now() + rpki.sundial.timedelta.parse(yaml["valid_for"]) self.base = rpki.resource_set.resource_bag( - asn = rpki.resource_set.resource_set_as(yaml.get("asn")), - v4 = rpki.resource_set.resource_set_ipv4(yaml.get("ipv4")), - v6 = rpki.resource_set.resource_set_ipv6(yaml.get("ipv6")), + asn = str(yaml.get("asn", "")), + v4 = yaml.get("ipv4"), + v6 = yaml.get("ipv6"), valid_until = valid_until) if "crl_interval" in yaml: self.crl_interval = rpki.sundial.timedelta.parse(yaml["crl_interval"]).convert_to_seconds() @@ -788,9 +788,9 @@ def create_root_certificate(db_root): print "Creating rootd RPKI root certificate" root_resources = rpki.resource_set.resource_bag( - asn = rpki.resource_set.resource_set_as("0-4294967295"), - v4 = rpki.resource_set.resource_set_ipv4("0.0.0.0/0"), - v6 = rpki.resource_set.resource_set_ipv6("::/0")) + asn = "0-4294967295", + v4 = "0.0.0.0/0", + v6 = "::/0") root_key = rpki.x509.RSA.generate(quiet = True) |