Fix node configuration/executable, and minor bugs

Change-Id: Ia442afe3146a532b01f8e7ef0f26c2dcbfdf4334
Issue-ID: MUSIC-281
Signed-off-by: Enrique Saurez <enrique.saurez@gmail.com>

3 files changed, 28 insertions, 21 deletions

diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/TestUtils.java b/mdbc-server/src/test/java/org/onap/music/mdbc/TestUtils.java
index 8c45c2e..291179a 100755
--- a/mdbc-server/src/test/java/org/onap/music/mdbc/TestUtils.java
+++ b/mdbc-server/src/test/java/org/onap/music/mdbc/TestUtils.java
@@ -201,7 +201,7 @@ public class TestUtils {
                         break;
                     case "all.public.ips":
                         String[] ips = prop.getProperty(key).split(":");
-                        if (ips.length == 1) {
+                        if (ips.length== 1) {
                             // Future use
                         } else if (ips.length > 1) {
                             MusicUtil.setAllPublicIps(
diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
index 0b2bb57..5221964 100644
--- a/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
+++ b/mdbc-server/src/test/java/org/onap/music/mdbc/mixins/MusicMixinTest.java
@@ -112,7 +112,7 @@ public class MusicMixinTest {
 
     @Test(timeout=1000)
     public void own() {
-        Range range = new Range("table1");
+        Range range = new Range("TABLE1");
         List<Range> ranges = new ArrayList<>();
         ranges.add(range);
         final DatabasePartition partition = TestUtils.createBasicRow(range, mixin, mdbcServerName);
@@ -149,21 +149,21 @@ public class MusicMixinTest {
     @Test(timeout=1000)
     public void own2() throws InterruptedException, MDBCServiceException {
         List<Range> range12 = new ArrayList<>( Arrays.asList(
-            new Range("range1"),
-            new Range("range2")
+            new Range("RANGE1"),
+            new Range("RANGE2")
         ));
         List<Range> range34 = new ArrayList<>( Arrays.asList(
-            new Range("range3"),
-            new Range("range4")
+            new Range("RANGE3"),
+            new Range("RANGE4")
         ));
         List<Range> range24 = new ArrayList<>( Arrays.asList(
-            new Range("range2"),
-            new Range("range4")
+            new Range("RANGE2"),
+            new Range("RANGE4")
         ));
         List<Range> range123 = new ArrayList<>( Arrays.asList(
-            new Range("range1"),
-            new Range("range2"),
-            new Range("range3")
+            new Range("RANGE1"),
+            new Range("RANGE2"),
+            new Range("RANGE3")
         ));
         DatabasePartition db1 = addRow(range12, false);
         DatabasePartition db2 = addRow(range34, false);
@@ -189,8 +189,8 @@ public class MusicMixinTest {
         DagNode missing = outgoingEdges.get(0);
         Set<Range> missingRanges = missing.getRangeSet();
         assertEquals(2,missingRanges.size());
-        assertTrue(missingRanges.contains(new Range("range1")));
-        assertTrue(missingRanges.contains(new Range("range3")));
+        assertTrue(missingRanges.contains(new Range("RANGE1")));
+        assertTrue(missingRanges.contains(new Range("RANGE3")));
         List<DagNode> outgoingEdges1 = missing.getOutgoingEdges();
         assertEquals(1,outgoingEdges1.size());
 
@@ -198,9 +198,9 @@ public class MusicMixinTest {
         assertFalse(finalNode.hasNotIncomingEdges());
         Set<Range> finalSet = finalNode.getRangeSet();
         assertEquals(3,finalSet.size());
-        assertTrue(finalSet.contains(new Range("range1")));
-        assertTrue(finalSet.contains(new Range("range2")));
-        assertTrue(finalSet.contains(new Range("range3")));
+        assertTrue(finalSet.contains(new Range("RANGE1")));
+        assertTrue(finalSet.contains(new Range("RANGE2")));
+        assertTrue(finalSet.contains(new Range("RANGE3")));
 
         DagNode node5 = dag.getNode(db5.getMRIIndex());
         List<DagNode> toRemoveOutEdges = node5.getOutgoingEdges();
diff --git a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java
index 753c629..0c2a804 100644
--- a/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java
+++ b/mdbc-server/src/test/java/org/onap/music/mdbc/ownership/OwnershipAndCheckpointTest.java
@@ -208,9 +208,12 @@ public class OwnershipAndCheckpointTest {
         OwnershipReturn own = cleanAndOwnPartition(ranges,ownOpId);
 
         Map<MusicRangeInformationRow, LockResult> locks = new HashMap<>();
-        locks.put(own.getDag().getNode(own.getRangeId()).getRow(),new LockResult(own.getRangeId(),own.getOwnerId(),true,
-            ranges));
-        ownAndCheck.checkpoint(musicMixin,mysqlMixin,own.getDag(),ranges,locks, ownOpId);
+        if(own.getDag()!=null) {
+            locks.put(own.getDag().getNode(own.getRangeId()).getRow(),
+                new LockResult(own.getRangeId(), own.getOwnerId(), true,
+                    ranges));
+            ownAndCheck.checkpoint(musicMixin, mysqlMixin, own.getDag(), ranges, locks, ownOpId);
+        }
 
         checkData();
     }
@@ -227,9 +230,13 @@ public class OwnershipAndCheckpointTest {
         UUID ownOpId = MDBCUtils.generateTimebasedUniqueKey();
         OwnershipReturn own = cleanAndOwnPartition(ranges,ownOpId);
 
+
         Map<MusicRangeInformationRow, LockResult> locks = new HashMap<>();
-        locks.put(own.getDag().getNode(own.getRangeId()).getRow(),new LockResult(own.getRangeId(),own.getOwnerId(),true,
-            ranges));
+        if(own.getDag()!=null) {
+            locks.put(own.getDag().getNode(own.getRangeId()).getRow(),
+                new LockResult(own.getRangeId(), own.getOwnerId(), true,
+                    ranges));
+        }
         ownAndCheck.warmup(musicMixin,mysqlMixin,ranges);
 
         checkData();