Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NWI-4: Add ALLOCATED-ASSIGNED PA inetnum status #1432

Merged
merged 20 commits into from
Apr 15, 2024
Merged

NWI-4: Add ALLOCATED-ASSIGNED PA inetnum status #1432

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b80cefa
add_allocated_assigned_pa
maggarwal13 Apr 9, 2024
c5507b9
Merge branch 'master' into add_allocated_assigned_pa
maggarwal13 Apr 9, 2024
6164abe
add_tests
maggarwal13 Apr 9, 2024
a85fb96
Merge branch 'master' into add_allocated_assigned_pa
maggarwal13 Apr 9, 2024
a0203b4
add_tests
maggarwal13 Apr 9, 2024
17b1d02
fix tests
maggarwal13 Apr 10, 2024
8d627f5
fix tests
maggarwal13 Apr 10, 2024
9ed8094
Merge branch 'fix_tests' into add_allocated_assigned_pa
maggarwal13 Apr 10, 2024
e112f4a
add delete tests
maggarwal13 Apr 10, 2024
0358734
Merge branch 'master' into add_allocated_assigned_pa
maggarwal13 Apr 10, 2024
e1b8d64
add modify
maggarwal13 Apr 10, 2024
168cbdd
fix compilation error
maggarwal13 Apr 10, 2024
e4f12cc
fix unit tests
maggarwal13 Apr 10, 2024
856358d
add more tests
maggarwal13 Apr 10, 2024
6b9e39c
add tests
maggarwal13 Apr 12, 2024
ed64b5b
indentation
maggarwal13 Apr 12, 2024
b58afd6
Merge branch 'master' into add_allocated_assigned_pa
eshryane Apr 15, 2024
d736f8e
Remove IANA as it's not used as an org-type for ALLOCATED PA.
eshryane Apr 15, 2024
152f76f
Fixed tests
eshryane Apr 15, 2024
1c7a2f7
Fixed tests
eshryane Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions whois-api/src/main/java/net/ripe/db/whois/api/rest/GeolocationService.java
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
248 changes: 246 additions & 2 deletions ...endtoend/src/test/groovy/net/ripe/db/whois/spec/integration/InetnumIntegrationSpec.groovy
View file
Open in desktop
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
Loading