Merge pull request #152 from fabric-testbed/release-1.9

cleaned up jupyter examples and add/tested example for supplying policy

jupyter/examples/supply_stitch_policy/config.fab → examples/supply_stitch_policy/config.fab

@@ -1,8 +1,6 @@
 variable:
   - node_count:
       default: 1
-  - vlan:
-      default: 3110
 
 provider:
   - cloudlab:
@@ -25,39 +23,35 @@ config:
           provider: fabric
           device_name: OCT-MGHPCC
           site: MASS
+          vlan_range: ['3110-3119']
           peer:
-            profile: fabfed-stitch-v2
+            profile: aes-fabfed-stitch-mass
             provider: cloudlab
             option:
               cluster: urn:publicid:IDN+cloudlab.umass.edu+authority+cm
-              interface:
-              - vlan: '{{ var.vlan }}' 
 
   - layer3:
       - my_layer:
           subnet: 192.168.1.0/24
-          gateway: 192.168.1.1
-          ip_start: 192.168.1.2
-          ip_end: 192.168.1.254
 resource:
   - network:
       - cnet:
           provider: '{{cloudlab.cloudlab_provider }}'
-          layer3: "{{ layer3.my_layer }}"
+          layer3: '{{ layer3.my_layer }}'
+
+      - fabric_network:
+          provider: '{{ fabric.fabric_provider }}'
+          layer3: '{{ layer3.my_layer }}'
+          stitch_with: '{{ network.cnet }}'
+          stitch_option:
+             policy: '{{ policy.my_stitch_policy }}'
   - node:
       - cloudlab_node:
           provider: '{{ cloudlab.cloudlab_provider }}'
-          network: "{{ network.cnet }}"
+          network: '{{ network.cnet }}'
           count: '{{ var.node_count }}'
-  - node:
+
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
-          network: "{{ network.fabric_network }}"
+          network: '{{ network.fabric_network }}'
           count: '{{ var.node_count }}'
-  - network:
-      - fabric_network:
-          provider: '{{ fabric.fabric_provider }}'
-          layer3: "{{ layer3.my_layer }}"
-          stitch_with: '{{ network.cnet }}'
-          stitch_option:
-             policy: '{{ policy.my_stitch_policy }}'

fabfed/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.9b"
+__VERSION__ = "1.9"

jupyter/examples/chameleon/tacc/config.fab → jupyter/examples/chameleon/config.fab

@@ -1,3 +1,8 @@
+variable:
+  - site:
+      default: TACC #STAR
+  - node_count:
+      default: 1
 provider:
   - fabric:
       - fabric_provider:
@@ -10,8 +15,7 @@ provider:
   - janus:
       - janus_provider:
           credential_file: ~/.fabfed/fabfed_credentials.yml
-          profile: janus 
-
+          profile: janus
 config:
   - layer3:
       - my_layer:
@@ -23,32 +27,34 @@ resource:
   - network:
       - chi_network:
           provider: '{{ chi.chi_provider }}'
-          name: stitch_net
-          layer3: "{{ layer3.my_layer }}"
+          layer3: '{{ layer3.my_layer }}'
+          # interface:
+          # - vlan:  # If need be select a vlan TACC ['3210-3499'] # STAR ['3300-3309'] 
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
-          layer3: "{{ layer3.my_layer }}"
-          stitch_with: '{{ network.chi_network }}'
-          count: 1
-          stitch_option:
-             site: TACC
+          layer3: '{{ layer3.my_layer }}'
+          # bw: 10
+          stitch_with:
+            - network: '{{ network.chi_network }}'
+              stitch_option:
+                site: '{{ var.site }}'
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
-          count: 1
           image: default_rocky_8
           network: '{{ network.fabric_network }}'
+          count: '{{ var.node_count }}'
       - chi_node:
           provider: '{{ chi.chi_provider }}'
           image: CC-Ubuntu20.04
           network: '{{ network.chi_network }}'
-          count: 1
           flavor: m1.medium
+          count: '{{ var.node_count }}'
   - service:
       - dtn_service:
           provider: '{{ janus.janus_provider }}'
-          node: [ '{{ node.chi_node }}', '{{ node.fabric_node }}' ]
+          node: ['{{ node.chi_node }}', '{{ node.fabric_node }}']
           controller: '{{ node.fabric_node }}'
           image: dtnaas/tools
           profile: fabfed
-          count: 1
+          count: 0

jupyter/examples/cloudlab/config.fab

@@ -1,7 +1,8 @@
 variable:
-  - site:
-      default: UTAH # CLEM
-
+  - node_count:
+      default: 1
+  - cloulab_device:
+      default: CloudLab-Clemson    # Utah-Cloudlab-Powder
 provider:
   - cloudlab:
       - cloudlab_provider:
@@ -14,41 +15,39 @@ provider:
   - janus:
       - janus_provider:
           credential_file: ~/.fabfed/fabfed_credentials.yml
-          profile: janus 
-
+          profile: janus
 config:
   - layer3:
-      - my_layer:
+      - layer3_config:
           subnet: 192.168.1.0/24
-          gateway: 192.168.1.1
-          ip_start: 192.168.1.2
-          ip_end: 192.168.1.254
 resource:
   - network:
       - cnet:
           provider: '{{cloudlab.cloudlab_provider }}'
-          layer3: "{{ layer3.my_layer }}"
+          layer3: '{{ layer3.layer3_config }}'
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
-          layer3: "{{ layer3.my_layer }}"
-          stitch_with: '{{ network.cnet }}'
+          layer3: '{{ layer3.layer3_config }}'
+          stitch_with:
+            - network: '{{ network.cnet }}'
+              stitch_option:
+                device_name: '{{ var.cloulab_device }}'
   - node:
+      - cloudlab_node:
+          provider: '{{ cloudlab.cloudlab_provider }}'
+          network: '{{ network.cnet }}'
+          count: '{{ var.node_count }}'
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
-          site: '{{ var.site }}'
-          image: default_rocky_8
-          nic_model: NIC_Basic
-          network: "{{ network.fabric_network }}"
-          count: 1
-      - cnode:
-          provider: '{{ cloudlab.cloudlab_provider }}'
-          network: "{{ network.cnet }}"
-          count: 1
+          # image: default_rocky_8
+          # nic_model: NIC_Basic
+          network: '{{ network.fabric_network }}'
+          count: '{{ var.node_count }}'
   - service:
       - dtn_service:
           provider: '{{ janus.janus_provider }}'
-          node: [ '{{ node.cnode }}', '{{ node.fabric_node }}' ]
           controller: '{{ node.fabric_node }}'
+          node: ['{{ node.cloudlab_node }}', '{{ node.fabric_node }}']
           image: dtnaas/tools
           profile: fabfed
-          count: 0
+          count: 0 # SET THIS TO 1 if you want use janus service

jupyter/examples/native-aws/config.fab

@@ -1,8 +1,18 @@
+variable:
+  - vpc:
+      default: 'vpc-0936b973cf039f794'  # specifies the vpc
+  -  vpc_subnet:
+      default: 10.0.1.0/24 
+  - node_count:
+      default: 1
+  - site:
+      default: KANS 
+
 provider:
   - aws:
       - aws_provider:
-          - credential_file: ~/.fabfed/fabfed_credentials.yml
-            profile: aws 
+          credential_file: ~/.fabfed/fabfed_credentials.yml
+          profile: aws 
   - fabric:
       - fabric_provider:
           credential_file: ~/.fabfed/fabfed_credentials.yml
@@ -11,42 +21,40 @@ config:
   - layer3:
       - fab_layer:
           subnet: 192.168.10.0/24
-          gateway: 192.168.10.1
-          ip_start: 192.168.10.2
-          ip_end: 192.168.10.254
       - aws_layer:
-          subnet: 10.0.1.0/24
+          subnet: '{{ var.vpc_subnet }}'
   - peering:
       - my_peering:
-          # FOR FABRIC
-          cloud_account: "296256999979" 
-          cloud_vpc: "vpc-0936b973cf039f794"    # to test dataplane ping 10.0.1.106  (vm instance i-078a7be6f4a3df5d6)
+          cloud_account: '296256999979' 
+          cloud_vpc: '{{ var.vpc }}'  # to test dataplane ping 10.0.1.106  (vm instance i-078a7be6f4a3df5d6)
+
+          # Example to point to specify an AWS facility supported by Fabric
+          # local_device: 'agg3.dall3'
+          # local_port: 'TenGigE0/0/0/13/3'
+          # cloud_region: 'us-east-1'
 
           remote_asn: 64512 # amazon_asn
           local_asn: 55038  # customer_asn
 
-          # FOR FABRIC
-          local_address: "192.168.1.1/30" # customer_ip
-          remote_address: "192.168.1.2/30" # amazon_ip
+          local_address: 192.168.1.1/30  # customer_ip
+          remote_address: 192.168.1.2/30 # amazon_ip
 resource:
   - network:
       - aws_net:
           provider: '{{ aws.aws_provider }}'
-          layer3: "{{ layer3.aws_layer }}"
-          peering: "{{ peering.my_peering }}"
-          stitch_with: '{{ network.fabric_network }}'
-          stitch_option:
-            device_name: agg3.ashb
-
+          layer3: '{{ layer3.aws_layer }}'
+          peering: '{{ peering.my_peering }}'
       - fabric_network:
           provider: '{{ fabric.fabric_provider }}'
-          layer3: "{{ layer3.fab_layer }}"
-          peering: "{{ peering.my_peering }}"
+          layer3: '{{ layer3.fab_layer }}'
+          peering: '{{ peering.my_peering }}'
+          stitch_with:
+          - network: '{{ network.aws_net }}'
   - node:
       - fabric_node:
           provider: '{{ fabric.fabric_provider }}'
-          site: MAX
-          image: default_rocky_8
           network: '{{ network.fabric_network }}'
+          site: '{{ var.site }}' 
+          image: default_rocky_8
           nic_model: NIC_Basic
-          count: 1
+          count: '{{ var.node_count }}'

jupyter/examples/native-aws/varfile.yml

@@ -1,3 +1 @@
 vpc: vpc-0936b973cf039f794
-#vpc: vpc-034da8fe2c9380fec
-#vpc: vpc-05bf1ae332ca8b212