fix for ERO ordering (#471)

also set standalone=false in app.properties
esnet · Apr 10, 2024 · c322534 · c322534
1 parent 1bb7bd6
commit c322534
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,7 +2,8 @@
 ### 1.2.5
 > Apr 2024
 - standalone setup for ESE development
-
+- bug fix for ERO ordering 
+
 ### 1.2.4
 > Mar 2024
 - further opentelemetry integration

diff --git a/backend/config/application.properties b/backend/config/application.properties
@@ -39,7 +39,7 @@ startup.exit=false
 # - topo.url is ignored
 # - southbound to NSO is skipped and assumed successful
 # - ESDB vlan syncs are skipped
-startup.standalone=true
+startup.standalone=false
 
 
 logging.config=config/logback.xml

diff --git a/backend/src/main/java/net/es/oscars/resv/ent/VlanPipe.java b/backend/src/main/java/net/es/oscars/resv/ent/VlanPipe.java
@@ -67,11 +67,13 @@ public VlanPipe(@JsonProperty("connectionId") String connectionId,
     @OneToMany(cascade = CascadeType.ALL)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @ToString.Exclude
+    @OrderBy("id ASC")
     private List<EroHop> azERO;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @ToString.Exclude
+    @OrderBy("id ASC")
     private List<EroHop> zaERO;
 
     // these will be populated by the system when designing