aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/org/onap
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-12 14:00:53 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-15 11:46:50 +0200
commit6406d19ed660371107aec3317856a492f6e22d0f (patch)
tree416ad3a734643ebd11f14266c7eaf7d79e20f29e /src/test/java/org/onap
parent023e0b5018247f02e05dbed3f91c495161fde814 (diff)
Update aai-common to 1.14.0 in graphadmin1.14.0
- update aai-common to 1.14.0 which contains Janusgraph update to 0.3.3 - introduce -v parameter to the datasnapshot scripts to specify graphson version Issue-ID: AAI-3871 Change-Id: I4efac6b8ef6cf6f5b264677c5a85e38cd226a194 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'src/test/java/org/onap')
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigrateHUBEvcInventoryTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryMethodTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigrateInvEvcInventoryTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigratePATHEvcInventoryTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v12/MigrateSAREvcInventoryTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitIdTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelInvariantIdTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelVersionIdTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelInvariantIdTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelVersionIdTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPServerDataTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v14/MigrateSdnaIvlanDataTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruthTest.java2
-rw-r--r--src/test/java/org/onap/aai/migration/v15/MigrateRadcomChangesTest.java2
15 files changed, 15 insertions, 15 deletions
diff --git a/src/test/java/org/onap/aai/migration/v12/MigrateHUBEvcInventoryTest.java b/src/test/java/org/onap/aai/migration/v12/MigrateHUBEvcInventoryTest.java
index 33afbfd..32190b5 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigrateHUBEvcInventoryTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigrateHUBEvcInventoryTest.java
@@ -296,7 +296,7 @@ public class MigrateHUBEvcInventoryTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryMethodTest.java b/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryMethodTest.java
index 2b2a61d..005517a 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryMethodTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryMethodTest.java
@@ -77,7 +77,7 @@ public class MigrateINVPhysicalInventoryMethodTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryTest.java b/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryTest.java
index aae92d4..e946a10 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventoryTest.java
@@ -86,7 +86,7 @@ public class MigrateINVPhysicalInventoryTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v12/MigrateInvEvcInventoryTest.java b/src/test/java/org/onap/aai/migration/v12/MigrateInvEvcInventoryTest.java
index f895c34..65e1905 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigrateInvEvcInventoryTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigrateInvEvcInventoryTest.java
@@ -83,7 +83,7 @@ public class MigrateInvEvcInventoryTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v12/MigratePATHEvcInventoryTest.java b/src/test/java/org/onap/aai/migration/v12/MigratePATHEvcInventoryTest.java
index b387f38..e302002 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigratePATHEvcInventoryTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigratePATHEvcInventoryTest.java
@@ -224,7 +224,7 @@ public class MigratePATHEvcInventoryTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v12/MigrateSAREvcInventoryTest.java b/src/test/java/org/onap/aai/migration/v12/MigrateSAREvcInventoryTest.java
index 9af7bb6..2951540 100644
--- a/src/test/java/org/onap/aai/migration/v12/MigrateSAREvcInventoryTest.java
+++ b/src/test/java/org/onap/aai/migration/v12/MigrateSAREvcInventoryTest.java
@@ -141,7 +141,7 @@ public class MigrateSAREvcInventoryTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitIdTest.java b/src/test/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitIdTest.java
index add3ace..154b253 100644
--- a/src/test/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitIdTest.java
+++ b/src/test/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitIdTest.java
@@ -144,7 +144,7 @@ public class MigrateForwarderEvcCircuitIdTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelInvariantIdTest.java b/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelInvariantIdTest.java
index bf12089..8adc9e5 100644
--- a/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelInvariantIdTest.java
+++ b/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelInvariantIdTest.java
@@ -74,7 +74,7 @@ public class MigrateInstanceGroupModelInvariantIdTest extends AAISetup{
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelVersionIdTest.java b/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelVersionIdTest.java
index d4333c5..4350f75 100644
--- a/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelVersionIdTest.java
+++ b/src/test/java/org/onap/aai/migration/v13/MigrateInstanceGroupModelVersionIdTest.java
@@ -77,7 +77,7 @@ public class MigrateInstanceGroupModelVersionIdTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelInvariantIdTest.java b/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelInvariantIdTest.java
index a570a2c..04c8ab6 100644
--- a/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelInvariantIdTest.java
+++ b/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelInvariantIdTest.java
@@ -76,7 +76,7 @@ public class MigrateVnfcModelInvariantIdTest extends AAISetup{
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelVersionIdTest.java b/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelVersionIdTest.java
index c11ff11..c79b06f 100644
--- a/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelVersionIdTest.java
+++ b/src/test/java/org/onap/aai/migration/v13/MigrateVnfcModelVersionIdTest.java
@@ -78,7 +78,7 @@ public class MigrateVnfcModelVersionIdTest extends AAISetup{
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPServerDataTest.java b/src/test/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPServerDataTest.java
index e09b36b..1a177f7 100644
--- a/src/test/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPServerDataTest.java
+++ b/src/test/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPServerDataTest.java
@@ -852,7 +852,7 @@ public class MigrateSameSourcedRCTROPServerDataTest extends AAISetup{
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v14/MigrateSdnaIvlanDataTest.java b/src/test/java/org/onap/aai/migration/v14/MigrateSdnaIvlanDataTest.java
index 83291b8..7f381f8 100644
--- a/src/test/java/org/onap/aai/migration/v14/MigrateSdnaIvlanDataTest.java
+++ b/src/test/java/org/onap/aai/migration/v14/MigrateSdnaIvlanDataTest.java
@@ -173,7 +173,7 @@ public class MigrateSdnaIvlanDataTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruthTest.java b/src/test/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruthTest.java
index f52258c..e8bebe5 100644
--- a/src/test/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruthTest.java
+++ b/src/test/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruthTest.java
@@ -372,7 +372,7 @@ public class PserverDedupWithDifferentSourcesOfTruthTest extends AAISetup{
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);
diff --git a/src/test/java/org/onap/aai/migration/v15/MigrateRadcomChangesTest.java b/src/test/java/org/onap/aai/migration/v15/MigrateRadcomChangesTest.java
index 5ba5644..a7ac9d8 100644
--- a/src/test/java/org/onap/aai/migration/v15/MigrateRadcomChangesTest.java
+++ b/src/test/java/org/onap/aai/migration/v15/MigrateRadcomChangesTest.java
@@ -266,7 +266,7 @@ public class MigrateRadcomChangesTest extends AAISetup {
TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
GraphTraversalSource traversal = g;
- GraphTraversalSource readOnly = tx.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance()));
+ GraphTraversalSource readOnly = graph.traversal().withStrategies(ReadOnlyStrategy.instance());
when (spy.tx()).thenReturn(tx);
when(spy.asAdmin()).thenReturn(adminSpy);
when(adminSpy.getTraversalSource()).thenReturn(traversal);