From ad06df94dcc9a3d948a97a837680ffb49a6b6d82 Mon Sep 17 00:00:00 2001 From: pa Date: Mon, 29 Apr 2024 23:02:17 +0000 Subject: [PATCH] fix memory and storage --- .cc/cookiecutter.json | 10 +++++----- .../devcontainer.json.jinja | 4 ++-- demos/avd-avd-extended-workshop--part-1/README.md | 4 ++-- .../clab/sn/dc1-leaf1a.txt | 4 ++-- .../clab/sn/dc1-leaf1b.txt | 4 ++-- .../clab/sn/dc1-leaf1c.txt | 4 ++-- .../clab/sn/dc1-leaf2a.txt | 4 ++-- .../clab/sn/dc1-leaf2b.txt | 4 ++-- .../clab/sn/dc1-leaf2c.txt | 4 ++-- .../clab/sn/dc1-spine1.txt | 4 ++-- .../clab/sn/dc1-spine2.txt | 4 ++-- .../avd-avd-extended-workshop--part-1.md | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.cc/cookiecutter.json b/.cc/cookiecutter.json index 5a58275..35aaf61 100644 --- a/.cc/cookiecutter.json +++ b/.cc/cookiecutter.json @@ -15,11 +15,11 @@ "ceos_lab_version": "4.30.6M", "git_init": true, "container_size": [ - {"cpus": 2, "memory": "8gb", "storage": "32gb"}, - {"cpus": 4, "memory": "16gb", "storage": "32gb"}, - {"cpus": 8, "memory": "32gb", "storage": "64gb"}, - {"cpus": 16, "memory": "64gb", "storage": "128gb"}, - {"cpus": 32, "memory": "128gb", "storage": "128gb"} + {"cpus": 2, "memory": "8 GB", "storage": "32 GB"}, + {"cpus": 4, "memory": "16 GB", "storage": "32 GB"}, + {"cpus": 8, "memory": "32 GB", "storage": "64 GB"}, + {"cpus": 16, "memory": "64 GB", "storage": "128 GB"}, + {"cpus": 32, "memory": "128 GB", "storage": "128 GB"} ], "cv_api_token_required": false, "clab_mgmt_subnet": "10.0.0.0", diff --git a/.cc/{{cookiecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja b/.cc/{{cookiecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja index cf68c13..0732c06 100644 --- a/.cc/{{cookiecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja +++ b/.cc/{{cookiecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja @@ -22,8 +22,8 @@ {% raw %}},{% endraw %} "hostRequirements": {% raw %}{{% endraw %} "cpus": {{ cookiecutter.container_size.cpus }}, - "memory": "{{ cookiecutter.container_size.memory }}", - "storage": "{{ cookiecutter.container_size.storage }}" + "memory": "{{ cookiecutter.container_size.memory.lower().replace(' ','') }}", + "storage": "{{ cookiecutter.container_size.storage.lower().replace(' ','') }}" {% raw %}},{% endraw %} "postCreateCommand": "postCreate.sh", "workspaceMount": "source=${localWorkspaceFolder}/demos/${containerWorkspaceFolder},target=/${containerWorkspaceFolder},type=bind", diff --git a/demos/avd-avd-extended-workshop--part-1/README.md b/demos/avd-avd-extended-workshop--part-1/README.md index c26b0c1..5086fed 100644 --- a/demos/avd-avd-extended-workshop--part-1/README.md +++ b/demos/avd-avd-extended-workshop--part-1/README.md @@ -6,8 +6,8 @@ This lab is tested for: Containerlab Version: 0.54.2 Codespace Container Size CPUs: 4 - memory: 16gb - storage: 32gb + memory: 16 GB + storage: 32 GB Last reviewed: 29/04/2024 diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1a.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1a.txt index 6c9e8f3..27e6f3d 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1a.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1a.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582BCFF -SYSTEMMACADDR=001c.7301.4B79 \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582CF14 +SYSTEMMACADDR=001c.7301.2031 \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1b.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1b.txt index 30235ba..382c6ea 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1b.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1b.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582F70A -SYSTEMMACADDR=001c.7301.5BDD \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582989F +SYSTEMMACADDR=001c.7301.C716 \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1c.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1c.txt index bd4c9e4..4132a07 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1c.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf1c.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A95826872 -SYSTEMMACADDR=001c.7301.C300 \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A95827696 +SYSTEMMACADDR=001c.7301.634B \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2a.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2a.txt index 2a1dfdb..5a42b1a 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2a.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2a.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582D473 -SYSTEMMACADDR=001c.7301.A61F \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A95826DB0 +SYSTEMMACADDR=001c.7301.2290 \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2b.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2b.txt index f65b323..49028f1 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2b.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2b.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582119A -SYSTEMMACADDR=001c.7301.A40C \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582063F +SYSTEMMACADDR=001c.7301.0A33 \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2c.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2c.txt index ebbb388..6ee8706 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2c.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-leaf2c.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582FF21 -SYSTEMMACADDR=001c.7301.767F \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582087F +SYSTEMMACADDR=001c.7301.9330 \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine1.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine1.txt index 50d99ae..d03d75a 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine1.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine1.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A958203F4 -SYSTEMMACADDR=001c.7301.2AB2 \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582D007 +SYSTEMMACADDR=001c.7301.44DD \ No newline at end of file diff --git a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine2.txt b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine2.txt index dd12582..2e92ac5 100644 --- a/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine2.txt +++ b/demos/avd-avd-extended-workshop--part-1/clab/sn/dc1-spine2.txt @@ -1,2 +1,2 @@ -SERIALNUMBER=1C68470A1E0CD6EF7418D78A95822847 -SYSTEMMACADDR=001c.7301.7BBB \ No newline at end of file +SERIALNUMBER=1C68470A1E0CD6EF7418D78A9582291F +SYSTEMMACADDR=001c.7301.8026 \ No newline at end of file diff --git a/docs/avd-avd-extended-workshop--part-1/avd-avd-extended-workshop--part-1.md b/docs/avd-avd-extended-workshop--part-1/avd-avd-extended-workshop--part-1.md index 8a916aa..5f34558 100644 --- a/docs/avd-avd-extended-workshop--part-1/avd-avd-extended-workshop--part-1.md +++ b/docs/avd-avd-extended-workshop--part-1/avd-avd-extended-workshop--part-1.md @@ -5,8 +5,8 @@ !!! Success "Container Requirements" CPUs: 4 - Memory: 16gb - Storage: 32gb + Memory: 16 GB + Storage: 32 GB :material-checkbox-marked-outline: Works with default Codespaces sizing!