Skip to content

Commit

Permalink
NWI-4: Add ALLOCATED-ASSIGNED PA inetnum status (#1432)
Browse files Browse the repository at this point in the history 
* add_allocated_assigned_pa

* add_tests

* add_tests

* fix tests

* fix tests

* add delete tests

* add modify

* fix compilation error

* fix unit tests

* add more tests

* add tests

* indentation

* Remove IANA as it's not used as an org-type for ALLOCATED PA.

* Fixed tests

* Fixed tests

---------

Co-authored-by: Ed Shryane <eshryane@ripe.net>
  • Loading branch information
@maggarwal13 @eshryane
maggarwal13 and eshryane authored Apr 15, 2024
1 parent a0f26de commit ae72d62
Show file tree
Hide file tree
Showing 13 changed files with 715 additions and 22 deletions.
1 change: 1 addition & 0 deletions whois-api/src/main/java/net/ripe/db/whois/api/rest/GeolocationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class GeolocationService {
InetnumStatus.ASSIGNED_PI,
InetnumStatus.ASSIGNED_ANYCAST,
InetnumStatus.ALLOCATED_PA,
InetnumStatus.ALLOCATED_ASSIGNED_PA,
InetnumStatus.ALLOCATED_UNSPECIFIED);

private static final Set<Inet6numStatus> STOP_AT_STATUS_IPV6 = Sets.immutableEnumSet(
Expand Down
35 changes: 35 additions & 0 deletions whois-api/src/test/java/net/ripe/db/whois/api/rest/GeolocationTestIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,41 @@ public void parent_inetnum_with_geolocation_and_language() throws Exception {
assertThat(response, containsString("<link xlink:type=\"locator\" xlink:href=\"http://rest.db.ripe.net/lookup/test/inetnum/10.0.0.0 - 10.255.255.255\"/>"));
}

@Test
public void parent_inetnum_with_geolocation_allocated_Assigned_pa() throws Exception {
databaseHelper.addObject(
"inetnum: 10.0.0.0 - 10.255.255.255\n" +
"netname: RIPE-NCC\n" +
"language: EN\n" +
"geoloc: 52.375599 5.9888802\n" +
"descr: Private Network\n" +
"country: NL\n" +
"tech-c: TP1-TEST\n" +
"status: ALLOCATED UNSPECIFIED\n" +
"mnt-by: OWNER-MNT\n" +
"mnt-lower: OWNER-MNT\n" +
"source: TEST");
databaseHelper.addObject(
"inetnum: 10.1.0.0 - 10.1.255.255\n" +
"netname: RIPE-NCC\n" +
"descr: Private Network\n" +
"geoloc: 52.375599 4.899902\n" +
"country: NL\n" +
"tech-c: TP1-TEST\n" +
"status: ALLOCATED-ASSIGNED PA\n" +
"mnt-by: OWNER-MNT\n" +
"mnt-lower: OWNER-MNT\n" +
"source: TEST");
ipTreeUpdater.rebuild();

final String response = RestTest.target(getPort(), "whois/geolocation?ipkey=10.1.0.0%20-%2010.1.255.255")
.request(MediaType.APPLICATION_XML)
.get(String.class);

assertThat(response, containsString("<location value=\"52.375599 4.899902\">"));
assertThat(response, containsString("<link xlink:type=\"locator\" xlink:href=\"http://rest.db.ripe.net/lookup/test/inetnum/10.1.0.0 - 10.1.255.255\"/>"));
}

@Test
public void inet6num_with_geolocation_and_language() throws Exception {
databaseHelper.addObject(
Expand Down
2 changes: 1 addition & 1 deletion whois-commons/src/main/java/net/ripe/db/whois/common/search/ManagedAttributeSearch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ManagedAttributeSearch {
private static final ImmutableSet<AttributeType> AUT_NUM_ATTRIBUTES = Sets.immutableEnumSet(AttributeType.AUT_NUM, AttributeType.ORG, AttributeType.SPONSORING_ORG, AttributeType.STATUS, AttributeType.SOURCE);

private static final ImmutableSet<InetnumStatus> INETNUM_ASSIGNMENT_STATUSES = Sets.immutableEnumSet(InetnumStatus.ASSIGNED_PI, InetnumStatus.ASSIGNED_ANYCAST);
private static final ImmutableSet<InetnumStatus> INETNUM_ALLOCATION_STATUSES = Sets.immutableEnumSet(InetnumStatus.ALLOCATED_PA, InetnumStatus.ALLOCATED_UNSPECIFIED);
private static final ImmutableSet<InetnumStatus> INETNUM_ALLOCATION_STATUSES = Sets.immutableEnumSet(InetnumStatus.ALLOCATED_PA, InetnumStatus.ALLOCATED_ASSIGNED_PA, InetnumStatus.ALLOCATED_UNSPECIFIED);
private static final ImmutableSet<InetnumStatus> INETNUM_LEGACY_STATUSES = Sets.immutableEnumSet(InetnumStatus.LEGACY);
private static final ImmutableSet<Inet6numStatus> INET6NUM_ALLOCATION_STATUSES = Sets.immutableEnumSet(Inet6numStatus.ALLOCATED_BY_RIR);
private static final ImmutableSet<Inet6numStatus> INET6NUM_ASSIGNMENT_STATUSES = Sets.immutableEnumSet(Inet6numStatus.ASSIGNED_PI, Inet6numStatus.ASSIGNED_ANYCAST);
Expand Down
250 changes: 247 additions & 3 deletions ...endtoend/src/test/groovy/net/ripe/db/whois/spec/integration/InetnumIntegrationSpec.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.ripe.db.whois.spec.integration


import net.ripe.db.whois.spec.domain.SyncUpdate
import org.junit.jupiter.api.Tag

Expand Down Expand Up @@ -373,6 +372,251 @@ class InetnumIntegrationSpec extends BaseWhoisSourceSpec {
response =~ /\*\*\*Info: Value 192.0.0.0\/24 converted to 192.0.0.0 - 192.0.0.255/
}

def "create ALLOCATED ASSIGNED PA inetnum using RS credentials"() {
when:
def response = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
password: hm
""".stripIndent(true)))
then:
response =~ /Create SUCCEEDED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response =~ /\*\*\*Info: Value 192.0.0.0\/24 converted to 192.0.0.0 - 192.0.0.255/
}

def "create ALLOCATED ASSIGNED PA inetnum using override credentials"() {
when:
def response = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
override:denis,override1
""".stripIndent(true)))
then:
response =~ /Create SUCCEEDED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response =~ /\*\*\*Info: Value 192.0.0.0\/24 converted to 192.0.0.0 - 192.0.0.255/
}

def "create ALLOCATED ASSIGNED PA inetnum failed without RS maintainer"() {
when:
def response = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
password: hm
""".stripIndent(true)))
then:
response =~ /Create FAILED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response.contains("***Error: Status ALLOCATED-ASSIGNED PA can only be created by the database\n" +
" administrator")
}

def "create ALLOCATED ASSIGNED PA inetnum failed using user credentials"() {
when:
def response = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
""".stripIndent(true)))
then:
response =~ /Create FAILED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response.contains("***Error: Setting status ALLOCATED-ASSIGNED PA requires administrative\n" +
" authorisation")
}

def "modify status ALLOCATED ASSIGNED PA status to ALLOCATED PA by using user credentials"() {
given:
def insertResponse = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: hm
password: update
""".stripIndent(true)))
when:
insertResponse =~ /SUCCESS/
then:
def response = syncUpdate new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
""".stripIndent(true))
then:
response =~ /SUCCESS/
response =~ /Modify SUCCEEDED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
}

def "modify status ALLOCATED PA to ALLOCATED-ASSIGNED PA status by using user credentials"() {
given:
def insertResponse = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: hm
password: update
""".stripIndent(true)))
when:
insertResponse =~ /SUCCESS/
then:
def response = syncUpdate new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
""".stripIndent(true))
then:
response =~ /SUCCESS/
response =~ /Modify SUCCEEDED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
}

def "modify status ALLOCATED PA to ALLOCATED UNSPECIFIED status fails"() {
given:
def insertResponse = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: hm
password: update
""".stripIndent(true)))
when:
insertResponse =~ /SUCCESS/
then:
def response = syncUpdate new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED UNSPECIFIED
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
""".stripIndent(true))
then:
response =~ /Modify FAILED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response =~ /\*\*\*Error: status value cannot be changed, you must delete and re-create the
object/
}

def "modify status ALLOCATED ASSIGNED PA status to ALLOCATED UNSPECIFIED fails"() {
given:
def insertResponse = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED-ASSIGNED PA
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: hm
password: update
""".stripIndent(true)))
when:
insertResponse =~ /SUCCESS/
then:
def response = syncUpdate new SyncUpdate(data: """\
inetnum: 192.0.0.0/24
netname: RIPE-NCC
descr: description
country: DK
admin-c: TEST-PN
tech-c: TEST-PN
status: ALLOCATED UNSPECIFIED
mnt-by: RIPE-NCC-HM-MNT
mnt-by: TEST-MNT
org: ORG-TOL5-TEST
source: TEST
password: update
""".stripIndent(true))
then:
response =~ /Modify FAILED: \[inetnum\] 192.0.0.0 - 192.0.0.255/
response =~ /\*\*\*Error: status value cannot be changed, you must delete and re-create the
object/
}

def "handle failure of out-of-range CIDR notation"() {
when:
def response = syncUpdate(new SyncUpdate(data: """\
Expand Down Expand Up @@ -432,7 +676,7 @@ class InetnumIntegrationSpec extends BaseWhoisSourceSpec {
}

def "create status ALLOCATED PA no alloc maintainer"() {
when:
when:
def insertResponse = syncUpdate(new SyncUpdate(data: """\
inetnum: 192.0.0.0 - 192.0.0.255
netname: RIPE-NCC
Expand Down Expand Up @@ -506,7 +750,7 @@ class InetnumIntegrationSpec extends BaseWhoisSourceSpec {
then:
response =~ /FAIL/
response =~ /Referenced organisation has wrong "org-type"/
response =~ /Allowed values are \[IANA, RIR, LIR\]/
response =~ /Allowed values are \[RIR, LIR\]/
}

def "modify status ALLOCATED PA has reference to non-RIR organisation with override"() {
Expand Down
Loading

0 comments on commit ae72d62

Please sign in to comment.