From: Dan Timoney Date: Tue, 25 Apr 2017 15:39:48 +0000 (+0000) Subject: Merge "[SDNC-7] summary" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=739d7b182b05fb631c4b993e28d8312a4eca6d69;hp=9d8a306476d16b6b63f4d4c710187fa4dde1b96e;p=sdnc%2Fcore.git Merge "[SDNC-7] summary" --- diff --git a/dblib/common/pom.xml b/dblib/common/pom.xml index fa25c98..722d99b 100755 --- a/dblib/common/pom.xml +++ b/dblib/common/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core dblib - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT dblib-common bundle diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml index 8111449..f6a4b7a 100755 --- a/dblib/features/pom.xml +++ b/dblib/features/pom.xml @@ -4,7 +4,7 @@ dblib org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT dblib-features DBLIB Adaptor - Features diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 08a92e1..0646479 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -4,7 +4,7 @@ dblib org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT dblib-installer DBLIB Adaptor - Karaf Installer diff --git a/dblib/pom.xml b/dblib/pom.xml index 5adb663..32127cb 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -3,7 +3,7 @@ org.openecomp.sdnc.core sdnc-core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT @@ -16,7 +16,7 @@ DBLIB Adaptor The DBLIB adaptor allows service logic to access persistent data in a local sql database - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 913adf3..9d9340f 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -4,10 +4,10 @@ org.openecomp.sdnc.core dblib - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT dblib-provider - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT bundle DBLIB Adaptor - Provider http://maven.apache.org diff --git a/filters/features/pom.xml b/filters/features/pom.xml index 89f2633..74247a6 100755 --- a/filters/features/pom.xml +++ b/filters/features/pom.xml @@ -4,7 +4,7 @@ filters org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT filters-features Filters - Features diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index be5fd81..cc2bdfb 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core filters - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT filters-installer Filters - Karaf Installer diff --git a/filters/pom.xml b/filters/pom.xml index 92cd42b..01d32bf 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core sdnc-core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ Filters Servlet filter to implement ECOMP logging spec - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index 3113b24..9c6efb9 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core filters - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT filters-provider bundle diff --git a/pom.xml b/pom.xml index 32fbd4e..b27bd6c 100755 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ OpenECOMP - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT diff --git a/rootpom/pom.xml b/rootpom/pom.xml index a5a5a3a..b2d08fa 100755 --- a/rootpom/pom.xml +++ b/rootpom/pom.xml @@ -6,7 +6,6 @@ org.opendaylight.odlparent odlparent 1.7.1-Boron-SR1 - ../../../../../opendaylight/odlparent diff --git a/sli/common/pom.xml b/sli/common/pom.xml index eb06e6b..8aa805f 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -3,7 +3,7 @@ sli org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sli-common bundle diff --git a/sli/features/pom.xml b/sli/features/pom.xml index c6a8438..d796986 100755 --- a/sli/features/pom.xml +++ b/sli/features/pom.xml @@ -4,7 +4,7 @@ sli org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sli-features SLI - Features diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index d025100..b26767f 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -4,7 +4,7 @@ sli org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sli-installer SLI - Karaf Installer diff --git a/sli/pom.xml b/sli/pom.xml index f3fea35..49f1fe1 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -5,7 +5,7 @@ org.openecomp.sdnc.core sdnc-core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT 4.0.0 pom @@ -59,7 +59,7 @@ openECOMP - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index a767e18..12886b0 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core sli - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sli-provider bundle diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java index d35d93c..6181548 100644 --- a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java +++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java @@ -35,6 +35,7 @@ import org.openecomp.sdnc.sli.provider.SvcLogicExpressionResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import junit.framework.Assert; import junit.framework.TestCase; public class SvcLogicExpressionResolverTest extends TestCase { @@ -50,21 +51,22 @@ public class SvcLogicExpressionResolverTest extends TestCase { try { - String testExpr = null; SvcLogicContext ctx = new SvcLogicContext(); SvcLogicGraph graph = new SvcLogicGraph(); SvcLogicNode node = new SvcLogicNode(1, "return", graph); graph.setRootNode(node); - - while ((testExpr = testsReader.readLine()) != null) { - testExpr = testExpr.trim(); - if (testExpr.startsWith("#")) + + String line = null; + int lineNo = 0; + while ((line = testsReader.readLine()) != null) { + ++lineNo; + if (line.startsWith("#")) { - testExpr = testExpr.substring(1).trim(); + String testExpr = line.trim().substring(1).trim(); String[] nameValue = testExpr.split("="); String name = nameValue[0].trim(); String value = nameValue[1].trim(); - + if (name.startsWith("$")) { LOG.info("Setting context attribute "+name+" = "+value); @@ -80,6 +82,12 @@ public class SvcLogicExpressionResolverTest extends TestCase { } else { + // if the line contains #, what comes before is the expression to evaluate, and what comes after + // is the expected value + String[] substrings = line.split("#"); + String expectedValue = substrings.length > 1 ? substrings[1].trim() : null; + String testExpr = substrings[0].trim(); + LOG.info("Parsing expression "+testExpr); SvcLogicExpression expr = SvcLogicExpressionFactory.parse(testExpr); if (expr == null) @@ -96,7 +104,10 @@ public class SvcLogicExpressionResolverTest extends TestCase { } else { - LOG.info("Expression "+testExpr+" evaluates to "+exprValue); + LOG.info("Expression " + testExpr + " evaluates to " + exprValue); + if (expectedValue != null) { + Assert.assertEquals("Line " + lineNo + ": " + testExpr, expectedValue, exprValue); + } } } } diff --git a/sli/provider/src/test/resources/expression.tests b/sli/provider/src/test/resources/expression.tests index c5661c3..848a0e7 100755 --- a/sli/provider/src/test/resources/expression.tests +++ b/sli/provider/src/test/resources/expression.tests @@ -6,19 +6,19 @@ # $network.segment[0].provider-segmentation-id = 1212 # $network.segment[1].provider-segmentation-id = 1213 # $availability-zone = mtsnj-esx-az01 -length($uni-circuit-id) > 0 -$uni-cir-units * 1000 * 100 / 100 -$uni-cir-units / 1000 -$uni-cir-units - 100 -$uni-cir-units + 100 -(value * 3 - $arg1 > 0) and (length($uni-circuit-id) == 0) -'pg-'+$network.name -$network.segment[0].provider-segmentation-id -toUpperCase($network.name) -toLowerCase($network.name) -toUpperCase(substr($availability-zone, 0, 5)) -convertBase(1234, 10) -convertBase(10, 16, 10) -convertBase(ZZ, 36, 10) -convertBase(10, 10, 36) -(0 - 1) * $arg1 +length($uni-circuit-id) > 0 # true +$uni-cir-units * 1000 * 100 / 100 # 10000 +$uni-cir-units / 1000 # 0 +$uni-cir-units - 100 # -90 +$uni-cir-units + 100 # 110 +(value * 3 - $arg1 > 0) and (length($uni-circuit-id) == 0) # true +'pg-'+$network.name # pg-vCE0001.in +$network.segment[0].provider-segmentation-id # 1212 +toUpperCase($network.name) # VCE0001.IN +toLowerCase($network.name) # vce0001.in +toUpperCase(substr($availability-zone, 0, 5)) # MTSNJ +convertBase(1234, 10) # 1234 +convertBase(10, 16, 10) # 16 +convertBase(ZZ, 36, 10) # 1295 +convertBase(10, 10, 36) # a +(0 - 1) * $arg1 # -1 diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml index 6f00e04..f539668 100755 --- a/sli/recording/pom.xml +++ b/sli/recording/pom.xml @@ -4,7 +4,7 @@ org.openecomp.sdnc.core sli - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sli-recording bundle diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml index 0ed4b0e..46a8b04 100755 --- a/sliPluginUtils/features/pom.xml +++ b/sliPluginUtils/features/pom.xml @@ -8,7 +8,7 @@ sliPluginUtils org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT SliPluginUtils Plugin - Features diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index cae4261..5562535 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -4,7 +4,7 @@ sliPluginUtils org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliPluginUtils-installer SLI Plugin Utilities - Karaf Installer diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 4feabcd..d94e361 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -3,7 +3,7 @@ org.openecomp.sdnc.core sliPluginUtils - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom 4.0.0 @@ -11,7 +11,7 @@ org.openecomp.sdnc.core sdnc-core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT Service Logic Interface Plugin Utilities A package of static utility functions to be used when developing SLI plugins diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index d7e2042..c7468e9 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -8,7 +8,7 @@ org.openecomp.sdnc.core sliPluginUtils - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT SliPluginUtils Plugin - Provider diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml index 02538cc..9f2ed4f 100755 --- a/sliapi/features/pom.xml +++ b/sliapi/features/pom.xml @@ -4,7 +4,7 @@ sliapi org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliapi-features diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index e8f21eb..38646e5 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -4,7 +4,7 @@ sliapi org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliapi-installer pom diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml index 7d7e4c9..4c933b2 100755 --- a/sliapi/model/pom.xml +++ b/sliapi/model/pom.xml @@ -4,7 +4,7 @@ sliapi org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliapi-model bundle diff --git a/sliapi/pom.xml b/sliapi/pom.xml index e613b95..c6a9b93 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -6,13 +6,13 @@ org.openecomp.sdnc.core sdnc-core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT pom org.openecomp.sdnc.core sliapi - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliapi diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index d942912..4d78fa5 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -4,7 +4,7 @@ sliapi org.openecomp.sdnc.core - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT sliapi-provider bundle diff --git a/version.properties b/version.properties index 3e97158..ca85875 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=1 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision}