diff options
| author |   Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-11 14:39:51 -0800 |
|---|---|---|
| committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-11 14:40:00 -0800 |
| commit | baac58c7c50e6f89eb0520e3f5b0e83a69839bd3 (patch) | |
| tree | 9c5a149ee6cdf345fed7dfe8c97fcaac8959a70d /framework/src/onos/tools | |
| parent | 8f92448e4f2f5d9c98036097bdabd1c40166908a (diff) | |
Updating onos src to commit id ec0425c18cbe49d368c600160f033acf9fe344ca
Change-Id: Iec2815bf7771080f25272842b852bd9d33f908ff
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/tools')
4 files changed, 6 insertions, 5 deletions
diff --git a/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml b/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml index e04479c5..fc6757a5 100644 --- a/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml +++ b/framework/src/onos/tools/build/conf/src/main/resources/onos/checkstyle.xml @@ -160,7 +160,9 @@ <module name="MemberName"/> <module name="MethodName"/> - <module name="PackageName"/> + <module name="PackageName"> + <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> + </module> <module name="ParameterName"/> <module name="StaticVariableName"/> <module name="TypeName"/> diff --git a/framework/src/onos/tools/build/onos-build-docs b/framework/src/onos/tools/build/onos-build-docs index 93a73c14..f7d0a0b8 100755 --- a/framework/src/onos/tools/build/onos-build-docs +++ b/framework/src/onos/tools/build/onos-build-docs @@ -34,11 +34,11 @@ rm -fr $ONOS_ROOT/docs/target cd $ONOS_ROOT/docs processPom external.xml -mvn -f aux-external.xml javadoc:aggregate +mvn -f aux-external.xml javadoc:aggregate "$@" cd target && mv site/apidocs $apidocs tar zcf $apidocs.tar.gz $apidocs && cp $apidocs.tar.gz /tmp cd $ONOS_ROOT/docs processPom internal.xml -mvn -f aux-internal.xml javadoc:aggregate +mvn -f aux-internal.xml javadoc:aggregate "$@" diff --git a/framework/src/onos/tools/dev/bash_profile b/framework/src/onos/tools/dev/bash_profile index a0f040a5..b8244a77 100644 --- a/framework/src/onos/tools/dev/bash_profile +++ b/framework/src/onos/tools/dev/bash_profile @@ -67,7 +67,6 @@ alias pub='onos-push-update-bundle' # Short-hand for tailing and searching the ONOS (karaf) log alias tl='$ONOS_ROOT/tools/dev/bin/onos-local-log' -alias ll='less $KARAF_LOG' alias gl='grep $KARAF_LOG --colour=auto -E -e ' function filterLocalLog { diff --git a/framework/src/onos/tools/test/scenarios/net-topo.xml b/framework/src/onos/tools/test/scenarios/net-topo.xml index abcf8642..cd720888 100644 --- a/framework/src/onos/tools/test/scenarios/net-topo.xml +++ b/framework/src/onos/tools/test/scenarios/net-topo.xml @@ -38,7 +38,7 @@ <step name="Net-Topo.Verify-Cluster0-LinkCount" requires="Net-Topo.Query-Cluster0" exec="test ${clusterTopo0LinkCount} == 140"/> <step name="Net-Topo.Verify-Cluster0-Root" requires="Net-Topo.Query-Cluster0" - exec="test '${clusterTopo0Root}' == 'of:000000000000000a'"/> + exec="test '${clusterTopo0Root}' == 'of:000000000000000a' -o '${clusterTopo0Root}' == 'of:000000000000000c'"/> <!-- Verify the list of devices for the cluster --> <step name="Net-Topo.Verify-Cluster0-Devices" |