Skip to content

Commit

Permalink
swapped --prefix with --name where applicable (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
hellt authored Nov 17, 2020
1 parent 4fd1ca9 commit 9b5f61a
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion clab/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (c *cLab) parseIPInfo() error {
// ParseTopology parses the lab topology
func (c *cLab) ParseTopology() error {
log.Info("Parsing topology information ...")
log.Debugf("Prefix: %s", c.Config.Name)
log.Debugf("Lab name: %s", c.Config.Name)
// initialize DockerInfo
err := c.parseIPInfo()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var execCmd = &cobra.Command{

Run: func(cmd *cobra.Command, args []string) {
if name == "" && topo == "" {
fmt.Println("provide either lab prefix (--prefix) or topology file path (--topo)")
fmt.Println("provide either lab name (--name) or topology file path (--topo)")
return
}
log.Debugf("raw command: %v", args)
Expand Down
4 changes: 2 additions & 2 deletions cmd/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var inspectCmd = &cobra.Command{

Run: func(cmd *cobra.Command, args []string) {
if name == "" && topo == "" {
fmt.Println("provide either a lab prefix (--prefix) or a topology file path (--topo)")
fmt.Println("provide either a lab name (--name) or a topology file path (--topo)")
return
}
opts := []clab.ClabOption{
Expand Down Expand Up @@ -76,7 +76,7 @@ func init() {
rootCmd.AddCommand(inspectCmd)

inspectCmd.Flags().BoolVarP(&details, "details", "", false, "print all details of lab containers")
inspectCmd.Flags().StringVarP(&format, "format", "f", "", "lab name prefix")
inspectCmd.Flags().StringVarP(&format, "format", "f", "", "lab name")
}

func toTableData(det []containerDetails) [][]string {
Expand Down
2 changes: 1 addition & 1 deletion cmd/save.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var saveCmd = &cobra.Command{
Short: "save containers configuration",
Run: func(cmd *cobra.Command, args []string) {
if name == "" && topo == "" {
fmt.Println("provide either lab prefix (--prefix) or topology file path (--topo)")
fmt.Println("provide either lab name (--name) or topology file path (--topo)")
return
}
opts := []clab.ClabOption{
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/ext-bridge.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 1 <br/>:fontawesome-solid-memory: 2 GB |
| **Topology file** | [br01.yml][topofile] |
| **Prefix** | br01 |
| **Name** | br01 |

## Description
This lab consists of three Nokia SR Linux nodes connected to a linux bridge.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/min-5clos.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 4 <br/>:fontawesome-solid-memory: 8 GB |
| **Topology file** | [clos02.yml][topofile] |
| **Prefix** | clos02 |
| **Name** | clos02 |

## Description
This labs provides a lightweight folded 5-stage CLOS fabric with Super Spine level bridging two PODs.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/min-clos.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 1.5 <br/>:fontawesome-solid-memory: 3 GB |
| **Topology file** | [clos01.yml][topofile] |
| **Prefix** | clos01 |
| **Name** | clos01 |

## Description
This labs provides a lightweight folded CLOS fabric topology using a minimal set of nodes: two leaves and a single spine.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/single-srl.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 0.5 <br/>:fontawesome-solid-memory: 1 GB |
| **Topology file** | [srl01.yml][topofile] |
| **Prefix** | srl01 |
| **Name** | srl01 |

## Description
A lab consists of a single SR Linux container equipped with a single interface - its management interface. No other network/data interfaces are created.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/srl-ceos.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl], [Arista cEOS][ceos] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 1 <br/>:fontawesome-solid-memory: 2 GB |
| **Topology file** | [srlceos01.yml][topofile] |
| **Prefix** | srlceos01 |
| **Name** | srlceos01 |

## Description
A lab consists of an SR Linux node connected with Arista cEOS via a point-to-point ethernet link. Both nodes are also connected with their management interfaces to the `containerlab` docker network.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/two-srls.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 1 <br/>:fontawesome-solid-memory: 2 GB |
| **Topology file** | [srl02.yml][topofile] |
| **Prefix** | srl02 |
| **Name** | srl02 |

## Description
A lab consists of two SR Linux nodes connected with each other via a point-to-point link over `e1-1` interfaces. Both nodes are also connected with their management interfaces to the `containerlab` docker network.
Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/wan.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| **Components** | [Nokia SR Linux][srl] |
| **Resource requirements**[^1] | :fontawesome-solid-microchip: 1 <br/>:fontawesome-solid-memory: 3 GB |
| **Topology file** | [srl03.yml][topofile] |
| **Prefix** | srl03 |
| **Name** | srl03 |

## Description
Nokia SR Linux while focusing on the data center deployments in the first releases, will also be suitable for WAN deployments. In this lab users presented with a small WAN topology of four interconnected SR Linux nodes with multiple p2p interfaces between them.
Expand Down

0 comments on commit 9b5f61a

Please sign in to comment.