removed interface attribute from example/demo fab files and used netw…

…ork attr in node
fabric-testbed · May 16, 2024 · 39115fb · 39115fb
1 parent 013cea4
commit 39115fb
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 24 deletions.
diff --git a/config/chi_to_fabric_stitching.fab b/config/chi_to_fabric_stitching.fab
@@ -29,14 +29,14 @@ resource:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           stitch_with: '{{ network.chi_network }}'
-          interface: '{{ node.fabric_node }}'
           layer3: "{{ layer3.my_layer }}"
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: '{{ var.fabric_site }}'
           count: 1
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           # nic_model: NIC_ConnectX_5. Defaults to NIC_Basic
       - chi_node:
           provider: '{{ chi.chi_provider }}'

diff --git a/examples/aws/config.fab b/examples/aws/config.fab
@@ -46,12 +46,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX # Use RENC when deploying to fabric beta environment
           image: default_rocky_8
           count: 1
+          network: '{{ network.fabric_network }}'
           nic_model: NIC_Basic
diff --git a/examples/cloudlab/config.fab b/examples/cloudlab/config.fab
@@ -27,14 +27,14 @@ resource:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.my_layer }}"
-          interface: '{{ node.fabric_node }}'
           stitch_with: '{{ network.cnet }}'
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: UTAH # CLEM  # UTAH
           image: default_rocky_8
           nic_model: NIC_Basic
+          network: "{{ network.fabric_network }}"
           count: 1
       - cnode:
           provider: '{{ cloudlab.cloudlab_provider }}'

diff --git a/examples/demos/cloudlab/clem/config.fab b/examples/demos/cloudlab/clem/config.fab
@@ -36,12 +36,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           image: default_rocky_8
           nic_model: NIC_Basic
+          network: "{{ network.fabric_network }}"
           count: 1
   - network:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.my_layer }}"
-          interface: '{{ node.fabric_node }}'
           stitch_with: '{{ network.cnet }}'
           stitch_option:
              device_name: CloudLab-Clemson

diff --git a/examples/demos/cloudlab/utah/config.fab b/examples/demos/cloudlab/utah/config.fab
@@ -40,12 +40,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           image: default_rocky_8
           nic_model: NIC_Basic
+          network: "{{ network.fabric_network }}"
           count: 1
   - network:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.my_layer }}"
-          interface: '{{ node.fabric_node }}'
           stitch_with: '{{ network.cnet }}'
           stitch_option:
              site: UTAH

diff --git a/examples/demos/native-aws/config.fab b/examples/demos/native-aws/config.fab
@@ -48,12 +48,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1 
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX # Use RENC when deploying to fabric beta environment
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           count: 1
           nic_model: NIC_Basic
diff --git a/examples/demos/native-gcp/config.fab b/examples/demos/native-gcp/config.fab
@@ -49,12 +49,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           count: 1 
           nic_model: NIC_Basic
diff --git a/examples/demos/sense-aws/config.fab b/examples/demos/sense-aws/config.fab
@@ -50,6 +50,7 @@ resource:
           site: MAX # Use RENC when deploying to fabric beta environment
           image: default_rocky_8
           count: 1
+          network: "{{ network.fabric_network }}"
           nic_model: NIC_Basic
   - network:
       - sense_net:
@@ -65,7 +66,6 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
 
   - service:

diff --git a/examples/demos/sense-gcp/config.fab b/examples/demos/sense-gcp/config.fab
@@ -47,6 +47,7 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX
           image: default_rocky_8
+          network: "{{ network.fabric_network }}"
           count: 1
           nic_model: NIC_Basic
   - network:
@@ -66,7 +67,6 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - service:
       - dtn_service:

diff --git a/examples/fabric_l2sts/config.fab b/examples/fabric_l2sts/config.fab
@@ -18,13 +18,14 @@ resource:
             image: default_rocky_8
             nic_model: NIC_Basic
             site: MAX 
+            network: '{{ network.fabric_network }}'
             flavor: {'cores': 2, 'ram': 8, 'disk': 10}
       - bnode:
             provider:  '{{ fabric.fabric_provider }}'
             site: WASH
+            network: '{{ network.fabric_network }}'
             image: default_rocky_8
   - network:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.my_layer }}"
-          interface: [ '{{ node.anode }}', '{{ node.bnode }}' ]
diff --git a/examples/gcp/config.fab b/examples/gcp/config.fab
@@ -45,12 +45,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           count: 1
           nic_model: NIC_Basic
diff --git a/examples/sense-aws/config.fab b/examples/sense-aws/config.fab
@@ -44,6 +44,7 @@ resource:
           image: default_rocky_8
           count: 1
           nic_model: NIC_Basic
+          network: "{{ network.fabric_network }}"
   - network:
       - sense_net:
           provider: '{{ sense.sense_provider }}'
@@ -59,5 +60,4 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
diff --git a/examples/sense-gcp/config.fab b/examples/sense-gcp/config.fab
@@ -48,6 +48,7 @@ resource:
           site: MAX
           image: default_rocky_8
           count: 1
+          network: "{{ network.fabric_network }}"
           nic_model: NIC_Basic
   - network:
       - sense_net:
@@ -66,7 +67,6 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - service:
       - dtn_service:

diff --git a/examples/sense-l2-dtn/config.fab b/examples/sense-l2-dtn/config.fab
@@ -12,12 +12,12 @@ resource:
           site: RENC
           image: default_rocky_8
           nic_model: NIC_Basic
+          network: '{{ network.fabric_network }}'
   - network:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           # site: UKY
           layer3: "{{ layer3.my_layer }}"
-          interface: '{{ node.fabric_node }}'
           stitch_with: '{{ network.net1 }}' # 852 to 855
           stitch_option:
               # profile: 'FABRIC-L2-DTN'

diff --git a/examples/service/config.fab b/examples/service/config.fab
@@ -34,7 +34,6 @@ resource:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           stitch_with: '{{ network.chi_network }}'
-          interface: '{{ node.fabric_node }}'
           layer3: "{{ layer3.my_layer }}"
           count: 1
 
@@ -57,6 +56,7 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           image: default_rocky_8
           nic_model: NIC_ConnectX_5
+          network: '{{ network.fabric_network }}'
           count: 1
 
       - chi_node:

diff --git a/examples/stitch/networks.fab b/examples/stitch/networks.fab
@@ -16,6 +16,5 @@ resource:
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
           stitch_with: '{{ network.chi_network }}'
-          interface: '{{ node.fabric_node }}'
           layer3: "{{ layer3.my_layer }}"
           count: 1
diff --git a/examples/stitch/nodes.fab b/examples/stitch/nodes.fab
@@ -5,10 +5,19 @@ resource:
           count: 1 
           image: default_rocky_8
           nic_model: NIC_Basic
+          network: '{{ network.fabric_network }}'
 
       - chi_node:
           provider: '{{ chi.chi_provider }}'
           image: CC-Ubuntu20.04
           network: '{{ network.chi_network }}'
-          count: 2
+          count: 1
           flavor: m1.medium
+  - service:
+      - dtn_service:
+          provider: '{{ janus.janus_provider }}'
+          node: [ '{{ node.chi_node }}', '{{ node.fabric_node }}' ]
+          controller: '{{ node.fabric_node }}'
+          image: dtnaas/tools
+          profile: fabfed
+          count: 0
diff --git a/examples/stitch/providers.fab b/examples/stitch/providers.fab
@@ -7,3 +7,8 @@ provider:
     - chi_provider:
           credential_file: ~/.fabfed/fabfed_credentials.yml
           profile: chi
+  - janus:
+      - janus_provider:
+          credential_file: ~/.fabfed/fabfed_credentials.yml
+          profile: janus
+
diff --git a/jupyter/examples/chameleon/tacc/config.fab b/jupyter/examples/chameleon/tacc/config.fab
@@ -27,7 +27,6 @@ resource:
           layer3: "{{ layer3.my_layer }}"
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
-          interface: '{{ node.fabric_node }}'
           layer3: "{{ layer3.my_layer }}"
           stitch_with: '{{ network.chi_network }}'
           count: 1
@@ -38,6 +37,7 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           count: 1
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
       - chi_node:
           provider: '{{ chi.chi_provider }}'
           image: CC-Ubuntu20.04

diff --git a/jupyter/examples/native-aws/config.fab b/jupyter/examples/native-aws/config.fab
@@ -46,12 +46,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX # Use RENC when deploying to fabric beta environment
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           count: 1
           nic_model: NIC_Basic
diff --git a/jupyter/examples/native-gcp/config.fab b/jupyter/examples/native-gcp/config.fab
@@ -45,12 +45,12 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX
           image: default_rocky_8
+          network: '{{ network.fabric_network }}'
           count: 1
           nic_model: NIC_Basic
diff --git a/jupyter/examples/sense-aws/config.fab b/jupyter/examples/sense-aws/config.fab
@@ -42,6 +42,7 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX # Use RENC when deploying to fabric beta environment
           image: default_rocky_8
+          network: "{{ network.fabric_network }}"
           count: 1
           nic_model: NIC_Basic
   - network:
@@ -59,5 +60,4 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
diff --git a/jupyter/examples/sense-gcp/config.fab b/jupyter/examples/sense-gcp/config.fab
@@ -41,13 +41,13 @@ resource:
           provider: '{{ sense.sense_provider }}'
           name: gcp-node
           network: "{{ network.sense_net }}"
-          service:
           count: 1 
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
           site: MAX
           image: default_rocky_8
           count: 1
+          network: "{{ network.fabric_network }}"
           nic_model: NIC_Basic
   - network:
       - sense_net:
@@ -66,7 +66,6 @@ resource:
           provider: '{{ fabric.fabric_provider }}'
           layer3: "{{ layer3.fab_layer }}"
           peering: "{{ peering.my_peering }}"
-          interface: '{{ node.fabric_node }}'
           count: 1
   - service:
       - dtn_service:

diff --git a/tests/examples/test-fabric-network/config.fab b/tests/examples/test-fabric-network/config.fab
@@ -21,7 +21,6 @@ resource:
            provider: '{{ fabric.fabric_provider }}'
            site: '{{ var.fabric_site }}'
            layer3: "{{ layer3.my_layer }}"
-           interface: '{{ node.fabric_node }}'
            #stitch_interface: 3307
            stitch_interface:
               id:
@@ -34,4 +33,5 @@ resource:
             site: '{{ var.fabric_site }}'
             count: 1 
             image: default_rocky_8
+            network: '{{ network.fabric_network }}'
             nic_model: NIC_ConnectX_5