Skip to content

Commit

Permalink
Minor edit
Browse files Browse the repository at this point in the history
  • Loading branch information
ccascone committed Sep 9, 2019
1 parent 13dca87 commit 8005ca5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ ptf/ptf.log
ptf/ptf.pcap
**/*.iml
**/*.pyc
**/*.bak
util/.pipe_cfg
4 changes: 2 additions & 2 deletions EXERCISE-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ You can ignore the ONOS one for now, we will use that in exercise 3 and 4.

To make sure the container is started without errors, you can use the `make
mn-log` command to show the Mininet log. Verify that you see the following
output (press Ctrl+C to exit):
output (press Ctrl-C to exit):

```
$ make mn-log
Expand Down Expand Up @@ -279,7 +279,7 @@ You should see the following output:

```
*** Attaching to Mininet CLI...
*** To detach press ctrl+D (Mininet will keep running)
*** To detach press Ctrl-D (Mininet will keep running)
mininet>
```

Expand Down
2 changes: 1 addition & 1 deletion EXERCISE-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ In another window, open the Mininet CLI and start a ping:
```
$ make mn-cli
*** Attaching to Mininet CLI...
*** To detach press ctrl+D (Mininet will keep running)
*** To detach press Ctrl-D (Mininet will keep running)
mininet> h1a ping h1b
```

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ restart: reset start

onos-cli:
$(info *** Connecting to the ONOS CLI... password: rocks)
$(info *** Top exit press ctrl+D)
$(info *** Top exit press Ctrl-D)
@ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -o LogLevel=ERROR -p 8101 onos@localhost

onos-log:
Expand All @@ -72,7 +72,7 @@ onos-ui:

mn-cli:
$(info *** Attaching to Mininet CLI...)
$(info *** To detach press ctrl+D (Mininet will keep running))
$(info *** To detach press Ctrl-D (Mininet will keep running))
-@docker attach --detach-keys "ctrl-d" $(shell docker-compose ps -q mininet) || echo "*** Detached from Mininet CLI"

mn-log:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ the exercises, here's a quick reference:
| `make start` | Start Mininet and ONOS containers |
| `make stop` | Stop all containers |
| `make reset` | Stop containers and remove any state associated |
| `make onos-cli` | Access the ONOS CLI (password: `rocks`, Ctrl+D to exit)|
| `make onos-cli` | Access the ONOS CLI (password: `rocks`, Ctrl-D to exit)|
| `make onos-log` | Show the ONOS log |
| `make mn-cli` | Access the Mininet CLI (Ctrl+D to exit) |
| `make mn-cli` | Access the Mininet CLI (Ctrl-D to exit) |
| `make mn-log` | Show the Mininet log (i.e., the CLI output) |
| `make app-build` | Build custom ONOS app |
| `make app-reload` | Install and activate the ONOS app |
Expand Down

0 comments on commit 8005ca5

Please sign in to comment.