Merge "[IDF] intel-pod18 private vlan range"

diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2
index 7ff3166..ad26a79 100644 (file)
--- a/config/installers/fuel/net_macros.j2
+++ b/config/installers/fuel/net_macros.j2
@@ -35,3 +35,15 @@
 {%- macro interface_str(nic, vlan = 0) -%}
     {{ nic }}{% if vlan | int > 0 %}.{{ vlan }}{% endif %}
 {%- endmacro -%}
+
+{%- macro vpp_interface_str(speed, pci_addr, driver = '') -%}
+    {%- set p = pci_addr.replace('.', ':').split(':') -%}
+    {%- set s = 'Ethernet%d/%d/%d' | format(p[-3] | int(0, 16),
+                                            p[-2] | int(0, 16),
+                                            p[-1] | int(0, 16)) -%}
+    {%- if 'vfio' in driver -%}
+    VirtualFunction{{ s }}
+    {%- else -%}
+    {% if '40g' in speed %}Forty{% elif '10g' in speed %}Ten{% endif %}Gigabit{{ s }}
+    {%- endif -%}
+{%- endmacro -%}

diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml
index 836f2da..a073515 100644 (file)
--- a/labs/arm/idf-pod10.yaml
+++ b/labs/arm/idf-pod10.yaml
@@ -142,9 +142,9 @@ idf:
               compute_kernel_isolcpu: *nova_cpu_pinning_common_arm
             dpdk:
               nova_cpu_pinning: "12-47"
-              compute_hugepages_size: 2M
-              compute_hugepages_count: 8192
-              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
               compute_kernel_isolcpu: *nova_cpu_pinning_common_arm
               compute_dpdk_driver: vfio
               compute_ovs_pmd_cpu_mask: "0x300"

diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index e07c2ea..6d6c9c3 100644 (file)
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -98,9 +98,9 @@ idf:
               compute_kernel_isolcpu: *nova_cpu_pinning_common
             dpdk:
               nova_cpu_pinning: "12-47"
-              compute_hugepages_size: 2M
-              compute_hugepages_count: 8192
-              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
               compute_kernel_isolcpu: *nova_cpu_pinning_common
               compute_dpdk_driver: vfio
               compute_ovs_pmd_cpu_mask: "0x300"

diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml
index d21fd87..2cc681b 100644 (file)
--- a/labs/arm/idf-pod7.yaml
+++ b/labs/arm/idf-pod7.yaml
@@ -100,9 +100,9 @@ idf:
               compute_kernel_isolcpu: *nova_cpu_pinning_common_a
             dpdk:
               nova_cpu_pinning: "4-47"
-              compute_hugepages_size: 2M
-              compute_hugepages_count: 8192
-              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
               compute_kernel_isolcpu: *nova_cpu_pinning_common_a
               compute_dpdk_driver: vfio
               compute_ovs_pmd_cpu_mask: "0xc"

diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml
index 2b0146a..f5ef724 100644 (file)
--- a/labs/arm/idf-pod8.yaml
+++ b/labs/arm/idf-pod8.yaml
@@ -96,9 +96,9 @@ idf:
               compute_kernel_isolcpu: *nova_cpu_pinning_common
             dpdk:
               nova_cpu_pinning: "12-47"
-              compute_hugepages_size: 2M
-              compute_hugepages_count: 8192
-              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
               compute_kernel_isolcpu: *nova_cpu_pinning_common
               compute_dpdk_driver: vfio
               compute_ovs_pmd_cpu_mask: "0x300"

diff --git a/labs/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml
index 27ae3cd..b6252d3 100644 (file)
--- a/labs/arm/idf-pod9.yaml
+++ b/labs/arm/idf-pod9.yaml
@@ -100,9 +100,9 @@ idf:
               compute_kernel_isolcpu: *nova_cpu_pinning_common
             dpdk:
               nova_cpu_pinning: "12-47"
-              compute_hugepages_size: 2M
-              compute_hugepages_count: 8192
-              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
               compute_kernel_isolcpu: *nova_cpu_pinning_common
               compute_dpdk_driver: vfio
               compute_ovs_pmd_cpu_mask: "0x300"

diff --git a/labs/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml
index ba025d0..8552918 100644 (file)
--- a/labs/arm/idf-virtual2.yaml
+++ b/labs/arm/idf-virtual2.yaml
@@ -36,7 +36,7 @@ idf:
       mask: 24
     private:
       interface: 2
-      vlan: native
+      vlan: 1000-1999
       network: 10.1.0.0
       mask: 24
     public:

diff --git a/labs/arm/virtual2.yaml b/labs/arm/virtual2.yaml
index 3c2b3b1..fda336c 100644 (file)
--- a/labs/arm/virtual2.yaml
+++ b/labs/arm/virtual2.yaml
@@ -92,22 +92,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual-pod1bl01.yaml b/labs/ericsson/virtual-pod1bl01.yaml
index 9edebee..996a330 100644 (file)
--- a/labs/ericsson/virtual-pod1bl01.yaml
+++ b/labs/ericsson/virtual-pod1bl01.yaml
@@ -115,22 +115,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual1.yaml b/labs/ericsson/virtual1.yaml
index c19d9c7..c7519bf 100644 (file)
--- a/labs/ericsson/virtual1.yaml
+++ b/labs/ericsson/virtual1.yaml
@@ -115,22 +115,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual2.yaml b/labs/ericsson/virtual2.yaml
index 7298b78..ca3f42e 100644 (file)
--- a/labs/ericsson/virtual2.yaml
+++ b/labs/ericsson/virtual2.yaml
@@ -115,22 +115,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual3.yaml b/labs/ericsson/virtual3.yaml
index 33f2e09..5c4f6ba 100644 (file)
--- a/labs/ericsson/virtual3.yaml
+++ b/labs/ericsson/virtual3.yaml
@@ -115,22 +115,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual4.yaml b/labs/ericsson/virtual4.yaml
index cbf50f0..de6c5ee 100644 (file)
--- a/labs/ericsson/virtual4.yaml
+++ b/labs/ericsson/virtual4.yaml
@@ -115,22 +115,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native

diff --git a/labs/ericsson/virtual5.yaml b/labs/ericsson/virtual5.yaml
index 4826044..0a9e602 100644 (file)
--- a/labs/ericsson/virtual5.yaml
+++ b/labs/ericsson/virtual5.yaml
@@ -107,22 +107,22 @@ nodes:
       address: 'qemu:///system'
     interfaces: &interfaces
       - name: 'nic1'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"  # MACs will be assigned by libvirt
         vlan: native
       - name: 'nic2'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic3'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - name: 'nic4'
-        speed: 10gb
+        speed: 1gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
         vlan: native