Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
f403791
Current work on OSCARS backend profiling setup
Jul 28, 2025
bbc662f
Current work on PoC work for CI/CD profiling setup
Aug 4, 2025
ee193e8
Merge branch 'master' into os-574-poc-oscars-profiler
Aug 4, 2025
45f6128
PoC complete, we can now demonstrate how to integrate oscars backend …
Aug 5, 2025
d611239
Adding PROFILING.md documentation
Aug 6, 2025
74227e2
Updates to documentation
Aug 6, 2025
c99508f
Fix markdown syntax mistake
Aug 6, 2025
5ccbdee
Adding initial OSCARS backend load test container setup
Aug 14, 2025
9636c6f
Updates to load testing plan and docker file setup
Aug 14, 2025
623a699
Merge branch 'master' into os-576-poc-oscars-load-test
Aug 14, 2025
2ad766d
Updating docker config to include a volume for the generated web repo…
Aug 19, 2025
e4e142a
Ignore load testing generated volume
Aug 20, 2025
0a0f894
merge master to develop (#583)
haniotak Aug 27, 2025
86ab6ad
Adding initial testing for NSI SOAP API (NsiProvider), with and witho…
Aug 28, 2025
8a95cfc
Adding topology service mock data for NsiProvider testing
Aug 29, 2025
ce1bbd4
Adding stubs
Aug 29, 2025
3f36aff
make nsiprovider single test pass
haniotak Sep 2, 2025
7268f68
Current work sorting out Nsi Provider test steps
Sep 2, 2025
250beaa
Cleaning up NsiProvider cuke testing
Sep 2, 2025
bd8e2ac
Held connections now get cleared per test step in NsiProviderStep
Sep 2, 2025
e1e91cb
Ensuring a blank projectId field with NSI SOAP API reserve() call res…
Sep 2, 2025
17896ee
Merge branch 'develop' into os-586-add-project-id-to-nsi-api
Sep 3, 2025
ea3de55
Merge pull request #584 from esnet/os-586-add-project-id-to-nsi-api
zrecore Sep 3, 2025
641c3d3
feat: [OS579] add project id set & view in frontend (#585)
haniotak Sep 3, 2025
abc51a4
Merge branch 'master' into develop
haniotak Sep 3, 2025
6a727b5
Merge branch 'develop' into os-576-poc-oscars-load-test
Sep 4, 2025
a7a4bb4
Initial work on CI/CD integration of OSCARS Backend profiler solution
Sep 9, 2025
2b9f838
Attempt to add mock env var values
Sep 9, 2025
7c5c038
Adjust DinD DOCKER_HOST value
Sep 9, 2025
d5d315c
Attempt to configure gitlab runner for DinD
Sep 9, 2025
0763524
Attempt to manually build/run docker containers to perform OSCARS pro…
Sep 9, 2025
369a9d0
Adjusting for resource cleanup with manual docker run (CI/CD OSCARS p…
Sep 9, 2025
b8448a2
Removing unused service for backend:profile
Sep 9, 2025
42d7ce7
Update CI/CD stuff
Sep 9, 2025
c9c3010
Attempting dind image
Sep 9, 2025
e88bcfc
Changing DOCKER env var settings, attempt to get profiler pipeline wo…
Sep 9, 2025
d660c19
Debugging commit
Sep 9, 2025
8644bb8
Attempt to use docker compose
Sep 9, 2025
39fb99e
attempting to enable r/w permissions in the /app/profiling directory,…
Sep 11, 2025
1fe3d4b
Adjusting DELAY_MIN
Sep 11, 2025
9c41657
Adjusting docker volume config for profiling data
Sep 11, 2025
fbbb231
Moving gitlab ci script stuff around
Sep 11, 2025
9e0d263
Attempt to manually copy profiling data out of oscars-backend contain…
Sep 11, 2025
579dc99
Adjusting profiling docker compose up command
Sep 11, 2025
d4a6f61
Adjusting gitlab ci YAML for profiling
Sep 11, 2025
1f4f38c
Troubleshooting artifact storage of profiling data
Sep 11, 2025
6382a52
Adding slight delay to allow dind service start up
Sep 11, 2025
8a8e1dc
Adjusting gitlab ci YAML for dind service check
Sep 11, 2025
0d996f6
Troubleshooting dind service
Sep 11, 2025
4b6f2cb
Attempting to troubleshoot volume R/W permission issue between host a…
Sep 11, 2025
75532a6
fix: [OS-618] [OS-617] [OS-619] multiple improvements (#589)
haniotak Sep 11, 2025
b829cb8
Asserting the expected FILENAME file was actually generated during pr…
Sep 11, 2025
8f4f9c5
Attempt to remove old docker compose network cruft
Sep 11, 2025
d5db776
Only run docker network rm on oscars-local-net if it exists
Sep 11, 2025
2904fa5
Remove wrong label property in docker compose profiling network config
Sep 11, 2025
085924a
It helps if the -f flag doesnt have a space in it...
Sep 11, 2025
02db4f5
add some docs to the dockerfile
haniotak Sep 11, 2025
86621c8
Merge pull request #588 from esnet/os-570-ci-cd-profiling
zrecore Sep 11, 2025
665c630
Attempting to setup CI/CD pipeline for OSCARS backend load testing wi…
Sep 15, 2025
ced2142
Fix gitlab-ci.yml
Sep 15, 2025
9c6d4bc
Attempt to troubleshoot docker compose network issue
Sep 15, 2025
3c7c51a
Helps if we use the correct docker compose YAML config
Sep 15, 2025
2671a4c
Split up docker compose between profiling and load test setup
Sep 15, 2025
f02a91f
Attempting to fix load test CI/CD for OSCARS backend
Sep 15, 2025
16e4294
Merge pull request #590 from esnet/os-571-ci-cd-load-testing
zrecore Sep 16, 2025
96ff4a4
Initial scaffolding for additional NSI Reserve Test Suite (NsiProvider)
Sep 19, 2025
03a939c
Current work on checkin NSI SOAP reservation state
Sep 24, 2025
2802ea3
Clean up unused imports
Sep 24, 2025
e23679c
Checking the correct mapping property for reservation state, refactor…
Sep 26, 2025
3ee61d8
Refactoring NsiService, NsiStateEngine to support callback handlers f…
Oct 1, 2025
d1490cf
Updating doc blocks in NsiStateEngine, update NsiProviderSteps to lim…
Oct 2, 2025
bca5889
Merge pull request #591 from esnet/os-484-nsi-reserve-test-suite
zrecore Oct 3, 2025
05281e8
update ESE controller tests to use real OSCARS logic (#594)
haniotak Oct 7, 2025
a2cf6aa
fix: [OS-634] make sure NSO dismantles happen before builds / redeplo…
haniotak Oct 7, 2025
edbdb08
feat: [OS-641] projectId now a set instead of a single string (#595)
haniotak Oct 8, 2025
dd7c2b7
1.2.33 release branch back to develop (#597)
haniotak Oct 8, 2025
d9662f1
make backend:profile an optional job (#598)
haniotak Oct 9, 2025
276d79c
Oscars annual reporting (#599)
haniotak Oct 9, 2025
a4b478a
fix npe when reservehandler null (#601)
haniotak Oct 21, 2025
f487f02
more npe fixing (#602)
haniotak Oct 21, 2025
3352a29
feat: [OS-633] [OS-632] add projectIds field validation against ESDB …
haniotak Oct 21, 2025
3c6069a
Fix sb queue (#603)
haniotak Oct 22, 2025
4275012
fix: [OS-652][OS-653] multithreading performance, and DB error fixes …
haniotak Nov 12, 2025
7e7ceef
fix: [OS-657] fix rare NPE during commit modify (#606)
haniotak Nov 18, 2025
09417c6
update changelog, standalone topology (#608)
haniotak Nov 19, 2025
24b04d7
Merge branch 'master' into develop
haniotak Nov 19, 2025
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
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# OSCARS Release Notes
### 1.2.35
> Nov 2025
- OS-657 Handle rare error when a modify would temporarily set connection.reserved to null
- OS-652 Commit on modify error
- OS-653 Fix task scheduling stalls

### 1.2.34
> Oct 2025
- OS-632 ProjectId validation against ESDB
Expand Down
13 changes: 10 additions & 3 deletions backend/config/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ spring.jackson.serialization.write-dates-as-timestamps=false
server.port=${OSCARS_BACKEND_WEB_PORT}
server.ssl.enabled=false
server.servlet-path=/
server.error.whitelabel.enabled=false

# Enable gzip compression BEGIN
server.compression.enabled=true
Expand Down Expand Up @@ -97,11 +98,14 @@ pce.short-path-detour=6
# how long to keep uncommitted reservations via REST API before expunging, in sec
resv.timeout=900
resv.minimum-duration=15
resv.state-delay=3s

# how long to keep uncommitted reservations via NSI SOAP API before expunging them, in sec

nsi.queue-interval-millisec=5000
nsi.resv-timeout=300
# how often to process NSI task queue
nsi.queue-delay=500ms
# how often to run NSI housekeeping
nsi.housekeeping-delay=10m

nsi.key-store=config/nsi.jks
nsi.key-store-type=JKS
nsi.key-store-alias=oscars
Expand Down Expand Up @@ -164,6 +168,9 @@ frontend.oauth-scope=openid
# comma-separate more origin URLS as needed
frontend.cors-origins=http://localhost:8181/

# how often to trigger southbound tasks
sb.trigger-delay=500ms

nso.vc-id-range=7000:7999
nso.sdp-id-range=7000:7999
nso.sap-qos-id-range=7000:7999
Expand Down
Loading
Loading