Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: tutorial freestanding deployment #4435

Merged
merged 76 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from 75 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
e71fa7d
First draft content
Nov 4, 2023
41c01f7
Deployment Guide - II
Nov 4, 2023
be46905
Deployment Guide - III
Nov 4, 2023
75c1696
deployment guide - corrections
Nov 4, 2023
085aacc
deployment guide - more corrections
Nov 4, 2023
d2d68d6
Update deployment guide
Nov 4, 2023
7372b00
Update deployment.rst
johnstudarus Nov 4, 2023
34887fa
Update deployment.rst
johnstudarus Nov 4, 2023
4bd46fd
correction
Nov 4, 2023
e54560a
Create br.toml
johnstudarus Nov 4, 2023
360bbcd
Create cs.toml
johnstudarus Nov 4, 2023
66dd3e0
Create dispatcher.toml
johnstudarus Nov 4, 2023
489c57c
Create sd.toml
johnstudarus Nov 4, 2023
4ee2c8e
sample topology files
nicorusti Nov 4, 2023
7d26f68
Last corrections deployment guide
Nov 4, 2023
6df205e
Update deployment.rst
johnstudarus Nov 5, 2023
560008f
Update deployment.rst
johnstudarus Nov 5, 2023
66f8e9f
deploy guide - first changes
Nov 5, 2023
cd44695
Update deployment.rst
johnstudarus Nov 5, 2023
d70d005
Update deployment.rst
johnstudarus Nov 5, 2023
11d4ccc
deploy guide - corrected table
Nov 5, 2023
34a74f9
Merge branch 'ietf118-hackathon' of https://github.com/cdekater/scion…
Nov 5, 2023
8a1b36f
Update deployment.rst
johnstudarus Nov 5, 2023
335fcea
private IP addressing
johnstudarus Nov 5, 2023
eea0710
added copy code button to conf.py
Nov 5, 2023
ac3e6b0
added VM hardware requirements
johnstudarus Nov 5, 2023
3da92cf
Merge pull request #1 from cdekater/added-VM-hardware-requirements
johnstudarus Nov 5, 2023
8676102
installing copy button
Nov 5, 2023
62dabe0
Merge branch 'ietf118-hackathon' of https://github.com/cdekater/scion…
Nov 5, 2023
b86400e
Update deployment.rst
johnstudarus Nov 5, 2023
6cef9b0
update deploy guide
Nov 5, 2023
a6fb573
Create TutorialDeploymentTopology.topo
johnstudarus Nov 5, 2023
2f80275
Update requirements.txt
FR4NK-W Nov 5, 2023
7f45238
added topology file
Nov 5, 2023
91ef445
Update deployment.rst
johnstudarus Nov 5, 2023
b0e52b3
Merge pull request #2 from cdekater/etc/hosts
johnstudarus Nov 5, 2023
748a849
Update deployment.rst
johnstudarus Nov 5, 2023
26dcc9d
correction
Nov 5, 2023
08e4d9b
software download
johnstudarus Nov 5, 2023
a5d95bb
Merge branch 'ietf118-hackathon' into johnstudarus-patch-1
johnstudarus Nov 5, 2023
14b5d38
Merge pull request #3 from cdekater/johnstudarus-patch-1
johnstudarus Nov 5, 2023
622c124
Update deployment.rst
johnstudarus Nov 5, 2023
888b97f
added copying files around
nicorusti Nov 5, 2023
5e0dc0d
Update deployment.rst
johnstudarus Nov 5, 2023
e55e897
Update deployment.rst
johnstudarus Nov 5, 2023
32302ab
Update deployment.rst
johnstudarus Nov 5, 2023
e69bf79
topology AS specific files
johnstudarus Nov 5, 2023
779b7b7
Update deployment.rst
johnstudarus Nov 5, 2023
942e169
Update deployment.rst
johnstudarus Nov 5, 2023
7764666
standardized on 10 IPs
johnstudarus Nov 5, 2023
9463d7a
private IPs
johnstudarus Nov 5, 2023
ee9af3e
fixed some typos
Nov 5, 2023
55ee091
private 10 IPs
johnstudarus Nov 5, 2023
212c142
private 10 IPs
johnstudarus Nov 5, 2023
5c1b618
private 10 IPs
johnstudarus Nov 5, 2023
620b669
correct dir
johnstudarus Nov 5, 2023
6f2044e
Corrected some mistakes
Nov 5, 2023
89a1941
more corrections
Nov 5, 2023
a36a657
generic id names
johnstudarus Nov 5, 2023
fd887c2
AS topology file
johnstudarus Nov 5, 2023
d70a6cf
Update deployment.rst
johnstudarus Nov 5, 2023
f73d386
last updates
Nov 5, 2023
2ff026c
Update deployment.rst
johnstudarus Nov 5, 2023
386f2e5
fix scp
nicorusti Nov 5, 2023
e3df2c0
typo
nicorusti Nov 5, 2023
30e4c53
add note about new TRC
nicorusti Nov 6, 2023
4a00b87
change mkdir
nicorusti Nov 6, 2023
49e3c7f
scp typo
nicorusti Nov 6, 2023
6cdf9a8
fixup file download links
matzf Nov 6, 2023
928b3bd
fixup: copy button prompt match
matzf Nov 6, 2023
904da46
fixup: fix internal references
matzf Nov 6, 2023
66c4248
Move tutorial into subfolder, add index entry
matzf Nov 9, 2023
0328ded
Merge branch 'master' into ietf118-hackathon
matzf Dec 22, 2023
40ede34
Update tutorial to install deb packages, avoid testcrypto command
matzf Feb 13, 2024
f3f793c
Merge branch 'master' into ietf118-hackathon
matzf Feb 13, 2024
12c76da
Fix up role description of core ASes in table to match script
matzf Feb 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@
'sphinx_rtd_theme',
'sphinx.ext.extlinks',
'sphinxcontrib.openapi',
'sphinx_copybutton',
]

copybutton_prompt_text = r'\w*\$ ' # matches e.g. <hostname>$
copybutton_prompt_is_regexp = True
copybutton_only_copy_prompt_lines = True


# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

Expand Down
12 changes: 12 additions & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@ implementation <https://github.com/scionproto/scion>`_.
snet documentation should be a good starting point for using SCION as an application library.
For this, the package documentation needs to be streamlined a bit...

Guides and Tutorials
^^^^^^^^^^^^^^^^^^^^

.. toctree::
:maxdepth: 1
:caption: Guides and Tutorials
:hidden:

tutorials/deploy

* :doc:`tutorials/deploy`: Follow step by step instructions and see what a running SCION network could look like.

Developer Documentation
^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 2 additions & 0 deletions doc/manuals/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Installation
************

.. _install-debian-packages:

Debian packages
===============

Expand Down
1 change: 1 addition & 0 deletions doc/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ recommonmark
sphinx-autobuild
sphinx-rtd-theme
sphinxcontrib-openapi
sphinx_copybutton
5 changes: 5 additions & 0 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,17 @@ sphinx==6.1.3 \
# -r requirements.in
# recommonmark
# sphinx-autobuild
# sphinx-copybutton
# sphinx-rtd-theme
# sphinxcontrib-httpdomain
# sphinxcontrib-openapi
sphinx-autobuild==2021.3.14 \
--hash=sha256:8fe8cbfdb75db04475232f05187c776f46f6e9e04cacf1e49ce81bdac649ccac \
--hash=sha256:de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05
sphinx-copybutton==0.5.2 \
--hash=sha256:4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd \
--hash=sha256:fb543fd386d917746c9a2c50360c7905b605726b9355cd26e9974857afeae06e
# via -r requirements.in
# via -r requirements.in
sphinx-mdinclude==0.5.3 \
--hash=sha256:02afadf4597aecf8255a702956eff5b8c5cb9658ea995c3d361722d2ed78cca9 \
Expand Down
378 changes: 378 additions & 0 deletions doc/tutorials/deploy.rst

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions doc/tutorials/deploy/br.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Deployment Guide Bridge Router Configuration File
# Save this file as /etc/scion/br.toml
[general]
id = "br"
config_dir = "/etc/scion"
18 changes: 18 additions & 0 deletions doc/tutorials/deploy/cs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Sample Control Service configuration file
# Save this file as /etc/scion/cs.toml
[general]
id = "cs"
config_dir = "/etc/scion"
reconnect_to_dispatcher = true

[log.console]
level = "info"

[beacon_db]
connection = "/var/lib/scion/control.beacon.db"

[path_db]
connection = "/var/lib/scion/control.path.db"

[trust_db]
connection = "/var/lib/scion/control.trust.db"
51 changes: 51 additions & 0 deletions doc/tutorials/deploy/topology1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"attributes": [
"core"
],
"isd_as": "42-ffaa:1:1",
"mtu": 1472,
"control_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"discovery_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"border_routers": {
"br": {
"internal_addr": "127.0.0.1:31002",
"interfaces": {
"1": {
"underlay": {
"public": "10.0.0.1:50014",
"remote": "10.0.0.4:50014"
},
"isd_as": "42-ffaa:1:4",
"link_to": "child",
"mtu": 1472
},
"2": {
"underlay": {
"public": "10.0.0.1:50012",
"remote": "10.0.0.2:50012"
},
"isd_as": "42-ffaa:1:2",
"link_to": "core",
"mtu": 1472
},
"3": {
"underlay": {
"public": "10.0.0.1:50013",
"remote": "10.0.0.3:50013"
},
"isd_as": "42-ffaa:1:3",
"link_to": "core",
"mtu": 1472
}
}
}
}
}
51 changes: 51 additions & 0 deletions doc/tutorials/deploy/topology2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"attributes": [
"core"
],
"isd_as": "42-ffaa:1:2",
"mtu": 1472,
"control_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"discovery_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"border_routers": {
"br": {
"internal_addr": "127.0.0.1:31002",
"interfaces": {
"1": {
"underlay": {
"public": "10.0.0.2:50012",
"remote": "10.0.0.1:50012"
},
"isd_as": "42-ffaa:1:1",
"link_to": "core",
"mtu": 1472
},
"2": {
"underlay": {
"public": "10.0.0.2:50023",
"remote": "10.0.0.3:50023"
},
"isd_as": "42-ffaa:1:3",
"link_to": "core",
"mtu": 1472
},
"3": {
"underlay": {
"public": "10.0.0.2:50025",
"remote": "10.0.0.5:50025"
},
"isd_as": "42-ffaa:1:5",
"link_to": "child",
"mtu": 1472
}
}
}
}
}
60 changes: 60 additions & 0 deletions doc/tutorials/deploy/topology3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"attributes": [
"core"
],
"isd_as": "42-ffaa:1:3",
"mtu": 1472,
"control_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"discovery_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"border_routers": {
"br": {
"internal_addr": "127.0.0.1:31002",
"interfaces": {
"1": {
"underlay": {
"public": "10.0.0.3:50013",
"remote": "10.0.0.1:50013"
},
"isd_as": "42-ffaa:1:1",
"link_to": "core",
"mtu": 1472
},
"2": {
"underlay": {
"public": "10.0.0.3:50023",
"remote": "10.0.0.2:50023"
},
"isd_as": "42-ffaa:1:2",
"link_to": "core",
"mtu": 1472
},
"3": {
"underlay": {
"public": "10.0.0.3:50034",
"remote": "10.0.0.4:50034"
},
"isd_as": "42-ffaa:1:4",
"link_to": "child",
"mtu": 1472
},
"4": {
"underlay": {
"public": "10.0.0.3:50035",
"remote": "10.0.0.5:50035"
},
"isd_as": "42-ffaa:1:5",
"link_to": "child",
"mtu": 1472
}
}
}
}
}
40 changes: 40 additions & 0 deletions doc/tutorials/deploy/topology4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"attributes": [],
"isd_as": "42-ffaa:1:4",
"mtu": 1472,
"control_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"discovery_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"border_routers": {
"br": {
"internal_addr": "127.0.0.1:31002",
"interfaces": {
"1": {
"underlay": {
"public": "10.0.0.4:50014",
"remote": "10.0.0.1:50014"
},
"isd_as": "42-ffaa:1:1",
"link_to": "parent",
"mtu": 1472
},
"2": {
"underlay": {
"public": "10.0.0.4:50034",
"remote": "10.0.0.3:50034"
},
"isd_as": "42-ffaa:1:3",
"link_to": "parent",
"mtu": 1472
}
}
}
}
}
40 changes: 40 additions & 0 deletions doc/tutorials/deploy/topology5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"attributes": [],
"isd_as": "42-ffaa:1:5",
"mtu": 1472,
"control_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"discovery_service": {
"cs": {
"addr": "127.0.0.1:31000"
}
},
"border_routers": {
"br": {
"internal_addr": "127.0.0.1:31002",
"interfaces": {
"1": {
"underlay": {
"public": "10.0.0.5:50025",
"remote": "10.0.0.2:50025"
},
"isd_as": "42-ffaa:1:2",
"link_to": "parent",
"mtu": 1472
},
"2": {
"underlay": {
"public": "10.0.0.5:50035",
"remote": "10.0.0.3:50035"
},
"isd_as": "42-ffaa:1:3",
"link_to": "parent",
"mtu": 1472
}
}
}
}
}
Loading