openstack/os-ken
Code Issues Proposed changes

Remove trailing whitespaces and tabs

Browse Source 
This is done to make pre-commit script happy.

TrivialFix

Change-Id: I4a080f8559b0392c6305c6d7c222be6ca006323c
This commit is contained in:
Slawek Kaplonski
2024-05-06 12:26:11 +02:00
parent a4e10d3d0b
commit 143d5bcd0e
275 changed files with 42303 additions and 42303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
doc/Makefile
View File

@@ -17,116 +17,116 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
help: help:
@echo "Please use \`make <target>' where <target> is one of" @echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files" @echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories" @echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file" @echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files" @echo " pickle to make pickle files"
@echo " json to make JSON files" @echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project" @echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project" @echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project" @echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub" @echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex" @echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " text to make text files" @echo " text to make text files"
@echo " man to make manual pages" @echo " man to make manual pages"
@echo " changes to make an overview of all changed/added/deprecated items" @echo " changes to make an overview of all changed/added/deprecated items"
@echo " linkcheck to check all external links for integrity" @echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)" @echo " doctest to run all doctests embedded in the documentation (if enabled)"
clean: clean:
-rm -rf $(BUILDDIR)/* -rm -rf $(BUILDDIR)/*
html: html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo @echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html." @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml: dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo @echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
singlehtml: singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo @echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
pickle: pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo @echo
@echo "Build finished; now you can process the pickle files." @echo "Build finished; now you can process the pickle files."
json: json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo @echo
@echo "Build finished; now you can process the JSON files." @echo "Build finished; now you can process the JSON files."
htmlhelp: htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo @echo
@echo "Build finished; now you can run HTML Help Workshop with the" \ @echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp." ".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp: qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo @echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:" ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/os_ken.qhcp" @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/os_ken.qhcp"
@echo "To view the help file:" @echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/os_ken.qhc" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/os_ken.qhc"
devhelp: devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo @echo
@echo "Build finished." @echo "Build finished."
@echo "To view the help file:" @echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/os_ken" @echo "# mkdir -p $$HOME/.local/share/devhelp/os_ken"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/os_ken" @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/os_ken"
@echo "# devhelp" @echo "# devhelp"
epub: epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo @echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub." @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
latex: latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo @echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \ @echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)." "(use \`make latexpdf' here to do that automatically)."
latexpdf: latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..." @echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf $(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
text: text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo @echo
@echo "Build finished. The text files are in $(BUILDDIR)/text." @echo "Build finished. The text files are in $(BUILDDIR)/text."
man: man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo @echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man." @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
changes: changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo @echo
@echo "The overview file is in $(BUILDDIR)/changes." @echo "The overview file is in $(BUILDDIR)/changes."
linkcheck: linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo @echo
@echo "Link check complete; look for any errors in the above output " \ @echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt." "or in $(BUILDDIR)/linkcheck/output.txt."
doctest: doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \ @echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt." "results in $(BUILDDIR)/doctest/output.txt."

4
doc/source/library_bgp_speaker.rst
View File

@@ -47,8 +47,8 @@ instance advertizes some prefixes.
peer_down_handler=detect_peer_down) peer_down_handler=detect_peer_down)
speaker.neighbor_add('192.168.177.32', 64513) speaker.neighbor_add('192.168.177.32', 64513)
# uncomment the below line if the speaker needs to talk with a bmp server. # uncomment the below line if the speaker needs to talk with a bmp server.
# speaker.bmp_server_add('192.168.177.2', 11019) # speaker.bmp_server_add('192.168.177.2', 11019)
count = 1 count = 1
while True: while True:
eventlet.sleep(30) eventlet.sleep(30)

132
os_ken/lib/netconf/netconf.xsd
View File

@@ -62,7 +62,7 @@
<xs:attribute name="message-id" type="messageIdType" <xs:attribute name="message-id" type="messageIdType"
use="required"/> use="required"/>
<!-- <!--
Arbitrary attributes can be supplied with <rpc> element. Arbitrary attributes can be supplied with <rpc> element.
--> -->
<xs:anyAttribute processContents="lax"/> <xs:anyAttribute processContents="lax"/>
</xs:complexType> </xs:complexType>
@@ -201,8 +201,8 @@
<xs:attribute name="message-id" type="messageIdType" <xs:attribute name="message-id" type="messageIdType"
use="optional"/> use="optional"/>
<!-- <!--
Any attributes supplied with <rpc> element must be returned Any attributes supplied with <rpc> element must be returned
on <rpc-reply>. on <rpc-reply>.
--> -->
<xs:anyAttribute processContents="lax"/> <xs:anyAttribute processContents="lax"/>
</xs:complexType> </xs:complexType>
@@ -271,13 +271,13 @@
--> -->
<xs:complexType name="configNameType"/> <xs:complexType name="configNameType"/>
<xs:element name="config-name" type="configNameType" <xs:element name="config-name" type="configNameType"
abstract="true"/> abstract="true"/>
<xs:element name="startup" type="configNameType" <xs:element name="startup" type="configNameType"
substitutionGroup="config-name"/> substitutionGroup="config-name"/>
<xs:element name="candidate" type="configNameType" <xs:element name="candidate" type="configNameType"
substitutionGroup="config-name"/> substitutionGroup="config-name"/>
<xs:element name="running" type="configNameType" <xs:element name="running" type="configNameType"
substitutionGroup="config-name"/> substitutionGroup="config-name"/>
<!-- <!--
<url> element <url> element
@@ -324,8 +324,8 @@
<xs:complexType name="filterInlineType"> <xs:complexType name="filterInlineType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="xs:anyType"> <xs:extension base="xs:anyType">
<xs:attribute name="type" type="FilterType" <xs:attribute name="type" type="FilterType"
default="subtree"/> default="subtree"/>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
@@ -360,9 +360,9 @@
<xs:complexType name="getType"> <xs:complexType name="getType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="filter" minOccurs="0" maxOccurs="1"/> <xs:element ref="filter" minOccurs="0" maxOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
@@ -374,15 +374,15 @@
<xs:complexType name="getConfigType"> <xs:complexType name="getConfigType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="source"/> <xs:element ref="source"/>
<xs:element ref="filter" minOccurs="0" maxOccurs="1"/> <xs:element ref="filter" minOccurs="0" maxOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="get-config" type="getConfigType" <xs:element name="get-config" type="getConfigType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<edit-config> operation <edit-config> operation
@@ -390,18 +390,18 @@
<xs:complexType name="editConfigType"> <xs:complexType name="editConfigType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="target"/> <xs:element ref="target"/>
<xs:element ref="default-operation" minOccurs="0"/> <xs:element ref="default-operation" minOccurs="0"/>
<xs:element ref="test-option" minOccurs="0"/> <xs:element ref="test-option" minOccurs="0"/>
<xs:element ref="error-option" minOccurs="0"/> <xs:element ref="error-option" minOccurs="0"/>
<xs:element ref="config" minOccurs="0"/> <xs:element ref="config" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="edit-config" type="editConfigType" <xs:element name="edit-config" type="editConfigType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<copy-config> operation <copy-config> operation
@@ -409,15 +409,15 @@
<xs:complexType name="copyConfigType"> <xs:complexType name="copyConfigType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="source"/> <xs:element ref="source"/>
<xs:element ref="target"/> <xs:element ref="target"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="copy-config" type="copyConfigType" <xs:element name="copy-config" type="copyConfigType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<delete-config> operation <delete-config> operation
@@ -425,14 +425,14 @@
<xs:complexType name="delete-configType"> <xs:complexType name="delete-configType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="target"/> <xs:element ref="target"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="delete-config" type="delete-configType" <xs:element name="delete-config" type="delete-configType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<lock> operation <lock> operation
@@ -440,14 +440,14 @@
<xs:complexType name="lockType"> <xs:complexType name="lockType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="target"/> <xs:element ref="target"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="lock" type="lockType" <xs:element name="lock" type="lockType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<unlock> operation <unlock> operation
@@ -455,14 +455,14 @@
<xs:complexType name="unlockType"> <xs:complexType name="unlockType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="target"/> <xs:element ref="target"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="unlock" type="unlockType" <xs:element name="unlock" type="unlockType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<validate> operation <validate> operation
@@ -470,14 +470,14 @@
<xs:complexType name="validateType"> <xs:complexType name="validateType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element ref="source"/> <xs:element ref="source"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="validate" type="validateType" <xs:element name="validate" type="validateType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<commit> operation <commit> operation
@@ -492,19 +492,19 @@
<xs:complexType name="commitType"> <xs:complexType name="commitType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element name="confirmed" minOccurs="0" maxOccurs="1"/> <xs:element name="confirmed" minOccurs="0" maxOccurs="1"/>
<xs:element name="confirm-timeout" type="confirmTimeoutType" <xs:element name="confirm-timeout" type="confirmTimeoutType"
minOccurs="0" maxOccurs="1"/> minOccurs="0" maxOccurs="1"/>
<xs:element name="persist" minOccurs="0" maxOccurs="1"/> <xs:element name="persist" minOccurs="0" maxOccurs="1"/>
<xs:element name="persist-id" type="persistIdType" <xs:element name="persist-id" type="persistIdType"
minOccurs="0" maxOccurs="1"/> minOccurs="0" maxOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="commit" type="commitType" <xs:element name="commit" type="commitType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<cancel-commit> operation <cancel-commit> operation
@@ -512,15 +512,15 @@
<xs:complexType name="cancelCommitType"> <xs:complexType name="cancelCommitType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element name="persist-id" type="persistIdType" <xs:element name="persist-id" type="persistIdType"
minOccurs="0" maxOccurs="1"/> minOccurs="0" maxOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="cancel-commit" type="cancelCommitType" <xs:element name="cancel-commit" type="cancelCommitType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<discard-changes> operation <discard-changes> operation
@@ -531,7 +531,7 @@
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="discard-changes" type="discardChangesType" <xs:element name="discard-changes" type="discardChangesType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<close-session> operation <close-session> operation
@@ -542,7 +542,7 @@
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="close-session" type="closeSessionType" <xs:element name="close-session" type="closeSessionType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
<!-- <!--
<kill-session> operation <kill-session> operation
@@ -550,13 +550,13 @@
<xs:complexType name="killSessionType"> <xs:complexType name="killSessionType">
<xs:complexContent> <xs:complexContent>
<xs:extension base="rpcOperationType"> <xs:extension base="rpcOperationType">
<xs:sequence> <xs:sequence>
<xs:element name="session-id" minOccurs="0" maxOccurs="1"/> <xs:element name="session-id" minOccurs="0" maxOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="kill-session" type="killSessionType" <xs:element name="kill-session" type="killSessionType"
substitutionGroup="rpcOperation"/> substitutionGroup="rpcOperation"/>
</xs:schema> </xs:schema>

6
os_ken/lib/of_config/of-config-1.1.1.xsd
View File

@@ -12,11 +12,11 @@
xmlns:inet="urn:ietf:params:xml:ns:yang:ietf-inet-types" xmlns:inet="urn:ietf:params:xml:ns:yang:ietf-inet-types"
xmlns:of11-config="urn:onf:of111:config:yang"> xmlns:of11-config="urn:onf:of111:config:yang">
<xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-inet-types" <xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-inet-types"
schemaLocation="ietf-inet-types.xsd"/> schemaLocation="ietf-inet-types.xsd"/>
<xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-yang-types" <xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-yang-types"
schemaLocation="ietf-yang-types.xsd"/> schemaLocation="ietf-yang-types.xsd"/>
<xs:import namespace="urn:ietf:params:xml:ns:netconf:base:1.0" <xs:import namespace="urn:ietf:params:xml:ns:netconf:base:1.0"
schemaLocation="../netconf/netconf.xsd"/> schemaLocation="../netconf/netconf.xsd"/>
<xs:annotation> <xs:annotation>
<xs:documentation> This schema was generated from the YANG module of-config1.1.1 by pyang <xs:documentation> This schema was generated from the YANG module of-config1.1.1 by pyang
version 1.2. The schema describes an instance document consisting of the entire version 1.2. The schema describes an instance document consisting of the entire

6
os_ken/lib/of_config/of-config-1.1.xsd
View File

@@ -7,11 +7,11 @@
xmlns:of12-config="urn:onf:params:xml:ns:onf:of12:config" xmlns:of12-config="urn:onf:params:xml:ns:onf:of12:config"
xmlns:inet="urn:ietf:params:xml:ns:yang:ietf-inet-types"> xmlns:inet="urn:ietf:params:xml:ns:yang:ietf-inet-types">
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" <xs:import namespace="http://www.w3.org/2000/09/xmldsig#"
schemaLocation="xmldsig-core-schema.xsd"/> schemaLocation="xmldsig-core-schema.xsd"/>
<xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-inet-types" <xs:import namespace="urn:ietf:params:xml:ns:yang:ietf-inet-types"
schemaLocation="ietf-inet-types.xsd"/> schemaLocation="ietf-inet-types.xsd"/>
<xs:import namespace="urn:ietf:params:xml:ns:netconf:base:1.0" <xs:import namespace="urn:ietf:params:xml:ns:netconf:base:1.0"
schemaLocation="../netconf/netconf.xsd"/> schemaLocation="../netconf/netconf.xsd"/>
<xs:element name="capable-switch" type="OFCapableSwitchType"> <xs:element name="capable-switch" type="OFCapableSwitchType">
<xs:annotation> <xs:annotation>
<xs:documentation>The OpenFlow Capable Switch and its configurationpoints, logical <xs:documentation>The OpenFlow Capable Switch and its configurationpoints, logical

2
os_ken/ofproto/ofproto_v1_2.py
View File

@@ -101,7 +101,7 @@ OFPP_FLOOD = 0xfffffffb # All physical ports except input port and
OFPP_ALL = 0xfffffffc # All physical ports except input port. OFPP_ALL = 0xfffffffc # All physical ports except input port.
OFPP_CONTROLLER = 0xfffffffd # Send to controller. OFPP_CONTROLLER = 0xfffffffd # Send to controller.
OFPP_LOCAL = 0xfffffffe # Local openflow "port". OFPP_LOCAL = 0xfffffffe # Local openflow "port".
OFPP_ANY = 0xffffffff # Not associated with a physical port. OFPP_ANY = 0xffffffff # Not associated with a physical port.
# All ones is used to indicate all queues in a port (for stats retrieval). # All ones is used to indicate all queues in a port (for stats retrieval).
OFPQ_ALL = 0xffffffff OFPQ_ALL = 0xffffffff

2
os_ken/ofproto/ofproto_v1_3.py
View File

@@ -106,7 +106,7 @@ OFPP_FLOOD = 0xfffffffb # All physical ports except input port and
OFPP_ALL = 0xfffffffc # All physical ports except input port. OFPP_ALL = 0xfffffffc # All physical ports except input port.
OFPP_CONTROLLER = 0xfffffffd # Send to controller. OFPP_CONTROLLER = 0xfffffffd # Send to controller.
OFPP_LOCAL = 0xfffffffe # Local openflow "port". OFPP_LOCAL = 0xfffffffe # Local openflow "port".
OFPP_ANY = 0xffffffff # Not associated with a physical port. OFPP_ANY = 0xffffffff # Not associated with a physical port.
# All ones is used to indicate all queues in a port (for stats retrieval). # All ones is used to indicate all queues in a port (for stats retrieval).
OFPQ_ALL = 0xffffffff OFPQ_ALL = 0xffffffff

2
os_ken/tests/mininet/run_mnet-test.sh
View File

@@ -206,7 +206,7 @@ arg_check() {
if [ $# -ne 0 ]; then if [ $# -ne 0 ]; then
ARGLIST=$* ARGLIST=$*
else else
ARGLIST=`find . -type f -name "*$TEST_SUFFIX"` ARGLIST=`find . -type f -name "*$TEST_SUFFIX"`
fi fi
for arg in $ARGLIST; do for arg in $ARGLIST; do

6
os_ken/tests/packet_data_generator/Makefile
View File

@@ -1,5 +1,5 @@
generate: generate:
rebar get-deps rebar get-deps
rebar compile rebar compile
erl -pa ebin deps/*/ebin -s x x -s init stop erl -pa ebin deps/*/ebin -s x x -s init stop

144
os_ken/tests/packet_data_generator/src/x5.erl
View File

@@ -707,42 +707,42 @@ x() ->
#ofp_get_async_request{}, #ofp_get_async_request{},
#ofp_get_async_reply{ #ofp_get_async_reply{
properties = properties =
[#ofp_async_config_prop_reasons{ [#ofp_async_config_prop_reasons{
type = packet_in_slave, type = packet_in_slave,
mask = [table_miss, apply_action]}, mask = [table_miss, apply_action]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = packet_in_master, type = packet_in_master,
mask = [table_miss, apply_action]}, mask = [table_miss, apply_action]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = port_status_slave, type = port_status_slave,
mask = [add, delete]}, mask = [add, delete]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = port_status_master, type = port_status_master,
mask = [add, delete]}, mask = [add, delete]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = flow_removed_slave, type = flow_removed_slave,
mask = [idle_timeout, hard_timeout]}, mask = [idle_timeout, hard_timeout]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = flow_removed_master, type = flow_removed_master,
mask = [idle_timeout, hard_timeout]}, mask = [idle_timeout, hard_timeout]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = role_status_slave, type = role_status_slave,
mask = [master_request, config]}, mask = [master_request, config]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = role_status_master, type = role_status_master,
mask = [master_request, config]}, mask = [master_request, config]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = table_status_slave, type = table_status_slave,
mask = [vacancy_down, vacancy_up]}, mask = [vacancy_down, vacancy_up]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = table_status_master, type = table_status_master,
mask = [vacancy_down, vacancy_up]}, mask = [vacancy_down, vacancy_up]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = requestforward_slave, type = requestforward_slave,
mask = [group_mod, meter_mod]}, mask = [group_mod, meter_mod]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = requestforward_master, type = requestforward_master,
mask = [group_mod, meter_mod]}, mask = [group_mod, meter_mod]},
#ofp_async_config_prop_experimenter{ #ofp_async_config_prop_experimenter{
type = experimenter_slave, type = experimenter_slave,
experimenter = 101, experimenter = 101,
@@ -760,42 +760,42 @@ x() ->
data = <<1:32, 2:32>>}]}, data = <<1:32, 2:32>>}]},
#ofp_set_async{ #ofp_set_async{
properties = properties =
[#ofp_async_config_prop_reasons{ [#ofp_async_config_prop_reasons{
type = packet_in_slave, type = packet_in_slave,
mask = [table_miss, apply_action]}, mask = [table_miss, apply_action]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = packet_in_master, type = packet_in_master,
mask = [table_miss, apply_action]}, mask = [table_miss, apply_action]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = port_status_slave, type = port_status_slave,
mask = [add, delete]}, mask = [add, delete]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = port_status_master, type = port_status_master,
mask = [add, delete]}, mask = [add, delete]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = flow_removed_slave, type = flow_removed_slave,
mask = [idle_timeout, hard_timeout]}, mask = [idle_timeout, hard_timeout]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = flow_removed_master, type = flow_removed_master,
mask = [idle_timeout, hard_timeout]}, mask = [idle_timeout, hard_timeout]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = role_status_slave, type = role_status_slave,
mask = [master_request, config]}, mask = [master_request, config]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = role_status_master, type = role_status_master,
mask = [master_request, config]}, mask = [master_request, config]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = table_status_slave, type = table_status_slave,
mask = [vacancy_down, vacancy_up]}, mask = [vacancy_down, vacancy_up]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = table_status_master, type = table_status_master,
mask = [vacancy_down, vacancy_up]}, mask = [vacancy_down, vacancy_up]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = requestforward_slave, type = requestforward_slave,
mask = [group_mod, meter_mod]}, mask = [group_mod, meter_mod]},
#ofp_async_config_prop_reasons{ #ofp_async_config_prop_reasons{
type = requestforward_master, type = requestforward_master,
mask = [group_mod, meter_mod]}, mask = [group_mod, meter_mod]},
#ofp_async_config_prop_experimenter{ #ofp_async_config_prop_experimenter{
type = experimenter_slave, type = experimenter_slave,
experimenter = 101, experimenter = 101,

4
os_ken/tests/packet_data_generator2/Makefile.BSD
View File

@@ -29,7 +29,7 @@ NOMAN=
all: generate all: generate
generate: ${PROG} generate: ${PROG}
${_MKMSG} "generate packet_data" ${_MKMSG} "generate packet_data"
cd ${.CURDIR} && ${.OBJDIR}/${PROG} cd ${.CURDIR} && ${.OBJDIR}/${PROG}
.include <bsd.prog.mk> .include <bsd.prog.mk>

6
os_ken/tests/packet_data_generator2/Makefile.GNU
View File

@@ -30,10 +30,10 @@ NOMAN=
all: generate all: generate
gen: gen.c gen: gen.c
${CC} $^ ${CPPFLAGS} ${LDFLAGS} -o $@ ${CC} $^ ${CPPFLAGS} ${LDFLAGS} -o $@
generate: ${PROG} generate: ${PROG}
./${PROG} ./${PROG}
clean: clean:
rm ${PROG} rm ${PROG}