Skip to content

Commit afd5bdb

Browse files
gizmoguygizmoguy
authored
Merge pull request #8 from faucetsdn/os-ken-2.9.0
Import os-ken 2.9.0 source.
2 parents de474ce + 2483f01 commit afd5bdb

File tree

288 files changed

+42373
-42322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+42373
-42322
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
default_language_version:
3+
# force all unspecified python hooks to run python3
4+
python: python3
5+
repos:
6+
- repo: https://github.com/pre-commit/pre-commit-hooks
7+
rev: v4.5.0
8+
hooks:
9+
- id: trailing-whitespace
10+
- id: mixed-line-ending
11+
args: ['--fix', 'lf']
12+
exclude: '.*\.(svg)$'
13+
- id: check-byte-order-marker
14+
- id: check-executables-have-shebangs
15+
- id: check-merge-conflict
16+
- id: debug-statements
17+
- id: check-yaml
18+
- repo: https://github.com/lucas-c/pre-commit-hooks
19+
rev: v1.5.4
20+
hooks:
21+
- id: remove-tabs
22+
exclude: '.*\.(svg)$'
23+
- repo: local
24+
hooks:
25+
- id: flake8
26+
name: flake8
27+
additional_dependencies:
28+
- hacking>=3.2.0,<3.3.0
29+
language: python
30+
entry: flake8
31+
files: '^.*\.py$'
32+
exclude: '^(doc|releasenotes|tools)/.*$'

‎doc/Makefile‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -17,116 +17,116 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou
1717
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
1818

1919
help:
20-
@echo "Please use \`make <target>' where <target> is one of"
21-
@echo " html to make standalone HTML files"
22-
@echo " dirhtml to make HTML files named index.html in directories"
23-
@echo " singlehtml to make a single large HTML file"
24-
@echo " pickle to make pickle files"
25-
@echo " json to make JSON files"
26-
@echo " htmlhelp to make HTML files and a HTML help project"
27-
@echo " qthelp to make HTML files and a qthelp project"
28-
@echo " devhelp to make HTML files and a Devhelp project"
29-
@echo " epub to make an epub"
30-
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
31-
@echo " latexpdf to make LaTeX files and run them through pdflatex"
32-
@echo " text to make text files"
33-
@echo " man to make manual pages"
34-
@echo " changes to make an overview of all changed/added/deprecated items"
35-
@echo " linkcheck to check all external links for integrity"
36-
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
20+
@echo "Please use \`make <target>' where <target> is one of"
21+
@echo " html to make standalone HTML files"
22+
@echo " dirhtml to make HTML files named index.html in directories"
23+
@echo " singlehtml to make a single large HTML file"
24+
@echo " pickle to make pickle files"
25+
@echo " json to make JSON files"
26+
@echo " htmlhelp to make HTML files and a HTML help project"
27+
@echo " qthelp to make HTML files and a qthelp project"
28+
@echo " devhelp to make HTML files and a Devhelp project"
29+
@echo " epub to make an epub"
30+
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
31+
@echo " latexpdf to make LaTeX files and run them through pdflatex"
32+
@echo " text to make text files"
33+
@echo " man to make manual pages"
34+
@echo " changes to make an overview of all changed/added/deprecated items"
35+
@echo " linkcheck to check all external links for integrity"
36+
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
3737

3838
clean:
39-
-rm -rf $(BUILDDIR)/*
39+
-rm -rf $(BUILDDIR)/*
4040

4141
html:
42-
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
43-
@echo
44-
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
42+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
43+
@echo
44+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
4545

4646
dirhtml:
47-
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
48-
@echo
49-
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
47+
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
48+
@echo
49+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
5050

5151
singlehtml:
52-
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
53-
@echo
54-
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
52+
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
53+
@echo
54+
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
5555

5656
pickle:
57-
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
58-
@echo
59-
@echo "Build finished; now you can process the pickle files."
57+
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
58+
@echo
59+
@echo "Build finished; now you can process the pickle files."
6060

6161
json:
62-
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
63-
@echo
64-
@echo "Build finished; now you can process the JSON files."
62+
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
63+
@echo
64+
@echo "Build finished; now you can process the JSON files."
6565

6666
htmlhelp:
67-
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
68-
@echo
69-
@echo "Build finished; now you can run HTML Help Workshop with the" \
70-
".hhp project file in $(BUILDDIR)/htmlhelp."
67+
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
68+
@echo
69+
@echo "Build finished; now you can run HTML Help Workshop with the" \
70+
".hhp project file in $(BUILDDIR)/htmlhelp."
7171

7272
qthelp:
73-
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
74-
@echo
75-
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
76-
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
77-
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/os_ken.qhcp"
78-
@echo "To view the help file:"
79-
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/os_ken.qhc"
73+
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
74+
@echo
75+
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
76+
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
77+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/os_ken.qhcp"
78+
@echo "To view the help file:"
79+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/os_ken.qhc"
8080

8181
devhelp:
82-
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
83-
@echo
84-
@echo "Build finished."
85-
@echo "To view the help file:"
86-
@echo "# mkdir -p $$HOME/.local/share/devhelp/os_ken"
87-
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/os_ken"
88-
@echo "# devhelp"
82+
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
83+
@echo
84+
@echo "Build finished."
85+
@echo "To view the help file:"
86+
@echo "# mkdir -p $$HOME/.local/share/devhelp/os_ken"
87+
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/os_ken"
88+
@echo "# devhelp"
8989

9090
epub:
91-
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
92-
@echo
93-
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
91+
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
92+
@echo
93+
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
9494

9595
latex:
96-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
97-
@echo
98-
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
99-
@echo "Run \`make' in that directory to run these through (pdf)latex" \
100-
"(use \`make latexpdf' here to do that automatically)."
96+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
97+
@echo
98+
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
99+
@echo "Run \`make' in that directory to run these through (pdf)latex" \
100+
"(use \`make latexpdf' here to do that automatically)."
101101

102102
latexpdf:
103-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
104-
@echo "Running LaTeX files through pdflatex..."
105-
$(MAKE) -C $(BUILDDIR)/latex all-pdf
106-
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
103+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
104+
@echo "Running LaTeX files through pdflatex..."
105+
$(MAKE) -C $(BUILDDIR)/latex all-pdf
106+
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
107107

108108
text:
109-
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
110-
@echo
111-
@echo "Build finished. The text files are in $(BUILDDIR)/text."
109+
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
110+
@echo
111+
@echo "Build finished. The text files are in $(BUILDDIR)/text."
112112

113113
man:
114-
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
115-
@echo
116-
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
114+
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
115+
@echo
116+
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
117117

118118
changes:
119-
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
120-
@echo
121-
@echo "The overview file is in $(BUILDDIR)/changes."
119+
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
120+
@echo
121+
@echo "The overview file is in $(BUILDDIR)/changes."
122122

123123
linkcheck:
124-
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
125-
@echo
126-
@echo "Link check complete; look for any errors in the above output " \
127-
"or in $(BUILDDIR)/linkcheck/output.txt."
124+
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
125+
@echo
126+
@echo "Link check complete; look for any errors in the above output " \
127+
"or in $(BUILDDIR)/linkcheck/output.txt."
128128

129129
doctest:
130-
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
131-
@echo "Testing of doctests in the sources finished, look at the " \
132-
"results in $(BUILDDIR)/doctest/output.txt."
130+
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
131+
@echo "Testing of doctests in the sources finished, look at the " \
132+
"results in $(BUILDDIR)/doctest/output.txt."

‎doc/source/conf.py‎

100755100644
File mode changed.

‎doc/source/library_bgp_speaker.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ instance advertizes some prefixes.
4747
peer_down_handler=detect_peer_down)
4848
4949
speaker.neighbor_add('192.168.177.32', 64513)
50-
# uncomment the below line if the speaker needs to talk with a bmp server.
51-
# speaker.bmp_server_add('192.168.177.2', 11019)
50+
# uncomment the below line if the speaker needs to talk with a bmp server.
51+
# speaker.bmp_server_add('192.168.177.2', 11019)
5252
count = 1
5353
while True:
5454
eventlet.sleep(30)

‎doc/source/man/osken_manager.rst‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ app
7777
--ctl-cert CTL_CERT
7878
controller certificate
7979

80-
--ctl-privkey CTL_PRIVKEY
80+
--ctl-privkey CTL_PRIVKEY
8181
controller private key
8282

83-
--default-log-level DEFAULT_LOG_LEVEL
83+
--default-log-level DEFAULT_LOG_LEVEL
8484
default log level
8585

8686
--explicit-drop
@@ -99,37 +99,37 @@ app
9999
--log-file LOG_FILE
100100
log file name
101101

102-
--log-file-mode LOG_FILE_MODE
102+
--log-file-mode LOG_FILE_MODE
103103
default log file permission
104104

105-
--neutron-admin-auth-url NEUTRON_ADMIN_AUTH_URL
105+
--neutron-admin-auth-url NEUTRON_ADMIN_AUTH_URL
106106
auth url for connecting to neutron in admin context
107107

108-
--neutron-admin-password NEUTRON_ADMIN_PASSWORD
108+
--neutron-admin-password NEUTRON_ADMIN_PASSWORD
109109
password for connecting to neutron in admin context
110110

111-
--neutron-admin-tenant-name NEUTRON_ADMIN_TENANT_NAME
111+
--neutron-admin-tenant-name NEUTRON_ADMIN_TENANT_NAME
112112
tenant name for connecting to neutron in admin context
113113

114-
--neutron-admin-username NEUTRON_ADMIN_USERNAME
114+
--neutron-admin-username NEUTRON_ADMIN_USERNAME
115115
username for connecting to neutron in admin context
116116

117-
--neutron-auth-strategy NEUTRON_AUTH_STRATEGY
117+
--neutron-auth-strategy NEUTRON_AUTH_STRATEGY
118118
auth strategy for connecting to neutron in admincontext
119119

120-
--neutron-controller-addr NEUTRON_CONTROLLER_ADDR
120+
--neutron-controller-addr NEUTRON_CONTROLLER_ADDR
121121
openflow method:address:port to set controller ofovs bridge
122122

123-
--neutron-url NEUTRON_URL
123+
--neutron-url NEUTRON_URL
124124
URL for connecting to neutron
125125

126-
--neutron-url-timeout NEUTRON_URL_TIMEOUT
126+
--neutron-url-timeout NEUTRON_URL_TIMEOUT
127127
timeout value for connecting to neutron in seconds
128128

129129
--noexplicit-drop
130130
The inverse of --explicit-drop
131131

132-
--noinstall-lldp-flow
132+
--noinstall-lldp-flow
133133
The inverse of --install-lldp-flow
134134

135135
--noobserve-links
@@ -147,13 +147,13 @@ app
147147
--observe-links
148148
observe link discovery events.
149149

150-
--ofp-listen-host OFP_LISTEN_HOST
150+
--ofp-listen-host OFP_LISTEN_HOST
151151
openflow listen host
152152

153-
--ofp-ssl-listen-port OFP_SSL_LISTEN_PORT
153+
--ofp-ssl-listen-port OFP_SSL_LISTEN_PORT
154154
openflow ssl listen port
155155

156-
--ofp-tcp-listen-port OFP_TCP_LISTEN_PORT
156+
--ofp-tcp-listen-port OFP_TCP_LISTEN_PORT
157157
openflow tcp listen port
158158

159159
--use-stderr
@@ -168,17 +168,17 @@ app
168168
--version
169169
show program's version number and exit
170170

171-
--wsapi-host WSAPI_HOST
171+
--wsapi-host WSAPI_HOST
172172
webapp listen host
173173

174-
--wsapi-port WSAPI_PORT
174+
--wsapi-port WSAPI_PORT
175175
webapp listen port
176-
177-
--test-switch-dir TEST-SWITCH_DIR
176+
177+
--test-switch-dir TEST-SWITCH_DIR
178178
test files directory
179179

180-
--test-switch-target TEST-SWITCH_TARGET
180+
--test-switch-target TEST-SWITCH_TARGET
181181
target sw dp-id
182182

183-
--test-switch-tester TEST-SWITCH_TESTER
183+
--test-switch-tester TEST-SWITCH_TESTER
184184
tester sw dp-id

‎etc/os_ken/os_ken.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Sample configuration file
1+
# Sample configuration file
22

33
[DEFAULT]
44

0 commit comments

Comments
 (0)