Merge branch 'dash' into dash_acl

Pterosaur · Pterosaur · commit bbf50320bece · 2022-12-23T09:06:01.000Z
diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml
@@ -63,10 +63,6 @@ parameters:
   type: boolean
   default: false
 
-- name: allow_failed_artifact
-  type: boolean
-  default: false
-
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
@@ -84,7 +80,6 @@ jobs:
       artifact: ${{ parameters.swss_common_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/${{ parameters.swss_common_branch }}'
-      allowFailedBuilds: ${{ parameters.allow_failed_artifact }}
       path: $(Build.ArtifactStagingDirectory)/download
     displayName: "Download sonic swss common deb packages"
   - task: DownloadPipelineArtifact@2
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -79,10 +79,6 @@ parameters:
   type: boolean
   default: false
 
-- name: allow_failed_artifact
-  type: boolean
-  default: false
-
 jobs:
 - job:
   displayName: ${{ parameters.arch }}
@@ -120,7 +116,6 @@ jobs:
       artifact: ${{ parameters.swss_common_artifact_name }}
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/${{ parameters.swss_common_branch }}'
-      allowFailedBuilds: ${{ parameters.allow_failed_artifact }}
       path: $(Build.ArtifactStagingDirectory)/download/swsscommon
       patterns: |
         libswsscommon_1.0.0_${{ parameters.arch }}.deb
diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -28,10 +28,6 @@ parameters:
   type: boolean
   default: false
 
-- name: allow_failed_artifact
-  type: boolean
-  default: false
-
 - name: num_ports
   type: number
   default: 0
@@ -65,7 +61,6 @@ jobs:
       artifact: sonic-swss-common.amd64.ubuntu20_04
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/${{ parameters.swss_common_branch }}'
-      allowFailedBuilds: ${{ parameters.allow_failed_artifact }}
       path: $(Build.ArtifactStagingDirectory)/download
     displayName: "Download sonic swss common deb packages"
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,7 +7,6 @@ pr:
 - master
 - 202???
 - 201???
-- dash
 
 trigger:
   batch: true
@@ -16,7 +15,6 @@ trigger:
     - master
     - 202???
     - 201???
-    - dash
 
 # this part need to be set in UI
 schedules:
@@ -27,7 +25,6 @@ schedules:
     - master
     - 202???
     - 201???
-    - dash
   always: true
 
 variables:
@@ -152,64 +149,3 @@ stages:
       swss_artifact_name: sonic-swss
       artifact_name: sonic-gcov
       archive_gcov: true
-
-- stage: DASH_Build
-  dependsOn: []
-  jobs:
-  - template: .azure-pipelines/build-template.yml
-    parameters:
-      arch: amd64
-      sonic_slave: sonic-slave-buster
-      swss_common_artifact_name: sonic-swss-common
-      swss_common_branch: dash
-      artifact_name: sonic-swss
-      archive_pytests: false
-      archive_gcov: true
-      allow_failed_artifact: true
-      sairedis_artifact_name: sonic-buildimage.vs
-      sairedis_artifact_project: nvidia
-      sairedis_artifact_pipeline: nvidia-sonic.sonic-buildimage
-      sairedis_artifact_branch: bluefield
-      sairedis_artifact_pattern: target/debs/buster
-      common_lib_artifact_name: sonic-buildimage.vs
-      common_lib_artifact_project: nvidia
-      common_lib_artifact_pipeline: nvidia-sonic.sonic-buildimage
-      common_lib_artifact_branch: bluefield
-
-
-- stage: DASH_BuildDocker
-  dependsOn: DASH_Build
-  condition: succeeded('DASH_Build')
-  jobs:
-  - template: .azure-pipelines/build-docker-sonic-vs-template.yml
-    parameters:
-      swss_common_artifact_name: sonic-swss-common
-      swss_common_branch: dash
-      swss_artifact_name: sonic-swss
-      allow_failed_artifact: true
-      artifact_name: docker-sonic-vs
-      buildimage_artifact_name: sonic-buildimage.vs
-      buildimage_artifact_project: nvidia
-      buildimage_artifact_pipeline: nvidia-sonic.sonic-buildimage
-      buildimage_artifact_branch: bluefield
-      sairedis_artifact_name: sonic-buildimage.vs
-      sairedis_artifact_project: nvidia
-      sairedis_artifact_pipeline: nvidia-sonic.sonic-buildimage
-      sairedis_artifact_branch: bluefield
-      sairedis_artifact_pattern: target/debs/buster
-
-- stage: DASH_Test
-  dependsOn: DASH_BuildDocker
-  condition: succeeded('DASH_BuildDocker')
-  jobs:
-  - template: .azure-pipelines/test-docker-sonic-vs-template.yml
-    parameters:
-      log_artifact_name: log
-      gcov_artifact_name: sonic-gcov
-      sonic_slave: sonic-slave-buster
-      swss_common_branch: dash
-      archive_gcov: true
-      allow_failed_artifact: true
-      num_ports: 2
-      run_tests_pattern: test_dash_*.py
-
diff --git a/orchagent/dash/dashorch.cpp b/orchagent/dash/dashorch.cpp
@@ -289,6 +289,12 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
         return false;
     }
 
+    if (appliance_entries_.empty())
+    {
+        SWSS_LOG_INFO("Retry as no appliance table entry found");
+        return false;
+    }
+
     sai_object_id_t &eni_id = entry.eni_id;
     sai_attribute_t eni_attr;
     vector<sai_attribute_t> eni_attrs;
@@ -317,6 +323,15 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
     eni_attr.value.booldata = entry.admin_state;
     eni_attrs.push_back(eni_attr);
 
+    eni_attr.id = SAI_ENI_ATTR_VM_UNDERLAY_DIP;
+    copy(eni_attr.value.ipaddr, entry.underlay_ip);
+    eni_attrs.push_back(eni_attr);
+
+    eni_attr.id = SAI_ENI_ATTR_VM_VNI;
+    auto app_entry = appliance_entries_.begin()->second;
+    eni_attr.value.u32 = app_entry.vm_vni;
+    eni_attrs.push_back(eni_attr);
+
     sai_status_t status = sai_dash_eni_api->create_eni(&eni_id, gSwitchId,
                                 (uint32_t)eni_attrs.size(), eni_attrs.data());
     if (status != SAI_STATUS_SUCCESS)
diff --git a/orchagent/dash/dashvnetorch.cpp b/orchagent/dash/dashvnetorch.cpp
@@ -291,6 +291,10 @@ bool DashVnetOrch::addOutboundCaToPa(const string& key, VnetMapBulkContext& ctxt
     memcpy(outbound_ca_to_pa_attr.value.mac, ctxt.mac_address.getMac(), sizeof(sai_mac_t));
     outbound_ca_to_pa_attrs.push_back(outbound_ca_to_pa_attr);
 
+    outbound_ca_to_pa_attr.id = SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_USE_DST_VNET_VNI;
+    outbound_ca_to_pa_attr.value.booldata = ctxt.use_dst_vni;
+    outbound_ca_to_pa_attrs.push_back(outbound_ca_to_pa_attr);
+
     object_statuses.emplace_back();
     outbound_ca_to_pa_bulker_.create_entry(&object_statuses.back(), &outbound_ca_to_pa_entry,
             (uint32_t)outbound_ca_to_pa_attrs.size(), outbound_ca_to_pa_attrs.data());
diff --git a/orchagent/dash/dashvnetorch.h b/orchagent/dash/dashvnetorch.h
@@ -59,7 +59,7 @@ struct VnetMapBulkContext
     swss::IpAddress underlay_ip;
     swss::MacAddress mac_address;
     uint32_t metering_bucket;
-    bool use_dst_vni;
+    bool use_dst_vni = false;
     std::deque<sai_status_t> outbound_ca_to_pa_object_statuses;
     std::deque<sai_status_t> pa_validation_object_statuses;
     VnetMapBulkContext() {}
