Merge branch 'develop' into 'master'

Develop

See merge request !1

code/addressplans/v4lab.txt

@@ -0,0 +1,18 @@
+LOOPBACKS: 192.0.2.0/24
+Core Routers: 192.0.2.0/26
+CR1: 192.0.2.1/32
+CR2: 192.0.2.2/32
+Distribution Switches: 192.0.2.64/26
+DS1: 192.0.2.64/32
+DS2: 192.0.2.65/32
+Access Switches: 192.0.2.128/25
+AS1: 192.0.2.132/29
+AS2: 192.0.2.133/29
+
+P2P LINKS: 192.168.255.0/24
+CR1-DS1: 192.168.255.0/30
+CR1-DS2: 192.168.255.4/30
+CR2-DS1: 192.168.255.8/30
+CR2-DS2: 192.168.255.12/30
+DS1-DS2: 192.168.255.16/30
+

code/channelbundling/example.cfg

@@ -0,0 +1 @@
+# Code goes here

main.tex

@@ -19,6 +19,8 @@
 \usepackage{lipsum}
 \usepackage{fancybox}
 \usepackage{varwidth}
+\usepackage{enumitem}
+
 
 % Define color
 \definecolor{codegreen}{rgb}{0,0.6,0}
@@ -71,7 +73,7 @@
 
 \newcommand{\notice}[2]{%
     \shadowbox{%
-        \begin{varwidth}{\linewidth}
+        \begin{varwidth}{0.85\linewidth}
             \texttt{\textbf{#1}}\\
             #2
         \end{varwidth}
@@ -107,6 +109,9 @@
 % Use the roman numeric system for pagenumbers
 \pagenumbering{roman}
 
+\setlist[itemize,1]{leftmargin=\dimexpr 26pt-.2cm}
+\setlist[itemize,2]{leftmargin=\dimexpr 26pt-.3cm}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %
 % BEGIN DOCUMENT                                     %
@@ -125,7 +130,8 @@
 \tableofcontents
 
 % Define length between paragrahps
-\setlength{\parskip}{1em}
+\setlength{\parskip}{0.35em}
+
 % Define lineheight
 \renewcommand{\baselinestretch}{1.15}
 
@@ -179,7 +185,7 @@
 
 \chapter{Protocols}
 
-\section{Routing}
+\section{Routed Network}
 
 \subsection{OSPF}
 \subsection{IS-IS}
@@ -190,7 +196,7 @@
 
 \newpage
 
-\section{VLAN}
+\section{Switch Network}
 
 \subsection{VTP}
 \fig{vtp/implementing-vtp}{imp-vtp1}{VTP}
@@ -286,16 +292,123 @@ wiped vlan database from the VTP domain.
 
 \subsubsection{Example configuration}
 \lstinputlisting{code/vtp/example.cfg}
-    
-\newpage
 
+\subsection{Channel Bundling (aka. EtherChannel, PortChannel)}
+Channel bundling is the "art" of using multiple physical links as one single logical link in when viewed from the perspective of the forwarding plane.
+
+Technologies:
+\begin{itemize}
+    \item \textbf{PAgP:} The Cisco-only thingy
+    \item \textbf{LACP:} The IEEE standard
+    \item \textbf{Static:} Just forced on
+\end{itemize}
+
+\fig{channelbundling/network-without-channelbundling}{noethernetchannel}%
+{No Channelbundling present}
+
+Channel bundling of switch ports in the network may or may not be the best idea, in regards to the networks growth rate in terms of min. required bandwidth.
+
+Channel bundling spreads out the in and egress flows based upon one of several methods configured on the switch:
+\begin{itemize}
+    \item Source to Destination MAC
+    \item Source to Destination IP
+\end{itemize}
+Keep in mind this will by no means archive true load balancing. Where all links are equally used based upon number of flows \textit{or} in terms of used bandwidth.
+
+\fig{channelbundling/network-with-channelbundling}{withethernetchannel}%
+{Channelbundling present}
+
+\subsubsection{Protocol Properties}
+
+\begin{itemize}
+    \item LACP
+    \begin{itemize}
+        \item Active: Enabled
+        \item Passive: Waits for LACP packets on the wire before enabled
+    \end{itemize}
+    \item PAgP
+    \begin{itemize}
+        \item Desirable: Enabled
+        \item Auto: Waits for PAgP packets on the wire before enabled
+    \end{itemize}
+\end{itemize}
+
+Some other \underline{required} settings to be (equal across all ports) aware of when configuring Channel bundling are
+\begin{enumerate}
+    \item Port speeds
+    \item Duplex mode
+    \item Configured vlan ranges
+\end{enumerate}
+
+\subsubsection{Example configuration}
+\lstinputlisting{code/channelbundling/example.cfg}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                    %
+% BEGIN section: Spanning Tree                       %
+%                                                    %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newpage
 \section{Spanning Tree}
 
-\subsection{STP}
+Spanning Tree exists for the \textbf{sole} reason to save "your" network and all the broadcast storms an network engineer having a bad day can by mistake create!
-\subsection{PVST}
-\subsection{RPVST+}
-\subsection{MTP}
 
+STP comes from the above desire where redundancy was wanted but no protocol existed before STP to help in this regard.
+
+% Please add the following required packages to your document preamble:
+% \usepackage{graphicx}
+\begin{table}[h]
+	\centering
+	\caption{Spanning Tree standrds}
+	\label{stpstandards}
+	\resizebox{\columnwidth}{!}{%
+		\begin{tabular}{|l|l|l|l|l|}
+			\hline
+			\textbf{} & \textbf{Standard} & \textbf{Ressource Usage} & \multicolumn{2}{l|}{\textbf{Convergence}} \\ \hline
+			CST       & 802.1D            & Low                      & Slow              & All vlans             \\ \hline
+			PVST+     & Cisco             & High                     & Slow              & Per vlan              \\ \hline
+			RSTP      & 802.1w            & So-so (Med.)             & Fast              & All vlans             \\ \hline
+			RPVST+    & Cisco             & On-the-double (V.High)   & Fast              & Per vlan              \\ \hline
+			MST       & 802.1s            & Med. - High              & Fast              & Vlan list             \\ \hline
+		\end{tabular}%
+	}
+\end{table}
+
+\subsection{Port Roles}
+
+When a switch is enabled for Spanning Tree. One of the following roles will have been assumed by any port on the switch in question.
+
+\begin{itemize}
+	\item \textbf{Root port:} Only 1 port on any switch (non-counting the root bridge!). Is always the port with the lowest metric (aka. best path) to the root bridge.
+	\item \textbf{Designated port:} A designated port is the port on any segment closest to the root bridge and forwarding traffic.
+	\item \textbf{\textit{Non}-designated port:} Put in blocking mode and not currently forwarding traffic.
+	\item \textbf{Disabled port:} The port has been one-way-or-another shut down.
+\end{itemize}
+
+\subsection{Standards}
+
+\subsubsection{STP}
+
+\subsubsection{PVST}
+
+\subsubsection{RPVST+}
+
+\subsubsection{MST}
+
+\subsection{Features}
+
+\begin{itemize}
+	\item PortFart
+	\item UplinkFast
+	\item BackboneFast
+	\item BPDU Guard
+	\item BPDU Filter
+	\item Root Guard
+	\item Loop Guard
+	\item Unidirectional Link Detection (UDLD)
+	\item FlexLinks
+\end{itemize}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %
@@ -313,7 +426,7 @@ wiped vlan database from the VTP domain.
 %                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\renewcommand{\listfigurename}{List of plots}
+\renewcommand{\listfigurename}{List of {\footnotesize hidden} Figures}
 \listoffigures
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -322,7 +435,7 @@ wiped vlan database from the VTP domain.
 %                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\renewcommand{\listtablename}{Tables}
+\renewcommand{\listtablename}{Tables {\footnotesize hidding} on the pages}
 \listoftables
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%