홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
a02fc817 1 parent ae2d0d76

Fixing & enhancing STC test scenarios. 

Change-Id: Ieff7ce5350a69d8ebb215a2344c67e41479cf371
Inline Side-by-side
Showing 5 changed files with 59 additions and 12 deletions
......@@ -6,7 +6,7 @@
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/build/envDefaults
export MAX_WAIT=45
export MAX_WAIT=60
cmd="$1" && shift
log="screenlog.0"
......
......@@ -16,8 +16,14 @@
<scenario name="net-pingall" description="Network pingall test">
<!-- TODO: parametrize this via recipes -->
<group name="Net-Pingall">
<step name="Ping-All-And-Verify"
exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: [0-5]% dropped"/>
<step name="Install-Apps"
exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
<step name="Check-Apps" requires="Install-Apps"
exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd"/>
<step name="Ping-All-And-Verify" requires="Check-Apps"
exec="onos-mininet sendAndExpect py net.pingAll(1) --expect Results: .% dropped"/>
<step name="Check-Summary-For-Hosts" requires="~Ping-All-And-Verify"
exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
......
......@@ -19,13 +19,7 @@
<step name="Push-Topos" exec="onos-push-topos ${OCN}"/>
<step name="Stop-Mininet-If-Needed" env="~" exec="onos-mininet stop"/>
<step name="Install-Apps"
exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
<step name="Check-Apps" requires="Install-Apps"
exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd"/>
<step name="Wipe-Out-Data-Before" requires="~Check-Apps" exec="onos-wipe-out"/>
<step name="Wipe-Out-Data-Before" exec="onos-wipe-out"/>
<step name="Initial-Summary-Check" requires="~Wipe-Out-Data-Before"
exec="onos-check-summary ${OC1} [0-9]* 0 0 0"/>
......@@ -42,5 +36,8 @@
<step name="Balance-Masters" requires="Check-Summary"
exec="onos ${OC1} balance-masters"/>
<step name="Pause-For-Masters" requires="Balance-Masters"
exec="sleep 10"/>
</group>
</scenario>
\ No newline at end of file
......
......@@ -17,6 +17,7 @@ package org.onosproject.ui.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import org.onlab.osgi.ServiceNotFoundException;
import org.onosproject.ui.UiExtensionService;
import javax.ws.rs.GET;
......@@ -38,6 +39,7 @@ import static com.google.common.io.ByteStreams.toByteArray;
public class MainIndexResource extends AbstractInjectionResource {
private static final String INDEX = "index.html";
private static final String NOT_READY = "not-ready.html";
private static final String INJECT_CSS_START = "<!-- {INJECTED-STYLESHEETS-START} -->";
private static final String INJECT_CSS_END = "<!-- {INJECTED-STYLESHEETS-END} -->";
......@@ -48,8 +50,15 @@ public class MainIndexResource extends AbstractInjectionResource {
@GET
@Produces(MediaType.TEXT_HTML)
public Response getMainIndex() throws IOException {
UiExtensionService service = get(UiExtensionService.class);
InputStream indexTemplate = getClass().getClassLoader().getResourceAsStream(INDEX);
ClassLoader classLoader = getClass().getClassLoader();
UiExtensionService service;
try {
service = get(UiExtensionService.class);
} catch (ServiceNotFoundException e) {
return Response.ok(classLoader.getResourceAsStream(NOT_READY)).build();
}
InputStream indexTemplate = classLoader.getResourceAsStream(INDEX);
String index = new String(toByteArray(indexTemplate));
int p1s = split(index, 0, INJECT_JS_START);
......
<!DOCTYPE html>
<!--
~ Copyright 2015 Open Networking Laboratory
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<html>
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="data/img/onos-logo.png">
<link rel="apple-touch-icon" href="data/img/apple-touch-icon.png">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="refresh" content="5;URL=/onos/ui">
<title>ONOS</title>
</head>
<body>
<h1>ONOS GUI not ready yet... stand by...</h1>
</body>
</html>