Merge branch 'master' of https://github.com/Azure/sonic-utilities int…

…o feature/add-lacp-rate-to-portchannel

azure-pipelines.yml

@@ -29,14 +29,22 @@ stages:
       image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
 
     steps:
+    - script: |
+        sourceBranch=$(Build.SourceBranchName)
+        if [[ "$(Build.Reason)" == "PullRequest" ]];then
+          sourceBranch=$(System.PullRequest.TargetBranch)
+        fi
+        echo "Download artifact branch: $sourceBranch"
+        echo "##vso[task.setvariable variable=sourceBranch]$sourceBranch"
+      displayName: "Get correct artifact downloading branch"
     - task: DownloadPipelineArtifact@2
       inputs:
         source: specific
         project: build
-        pipeline: 1
+        pipeline: 142
         artifact: sonic-buildimage.vs
         runVersion: 'latestFromBranch'
-        runBranch: 'refs/heads/master'
+        runBranch: 'refs/heads/$(sourceBranch)'
       displayName: "Download artifacts from latest sonic-buildimage build"
 
     - script: |
@@ -117,19 +125,3 @@ stages:
     - publish: '$(System.DefaultWorkingDirectory)/dist/'
       artifact: wheels
       displayName: "Publish Python wheels"
-
-- stage: BuildDocker
-  dependsOn: Build
-  condition: succeeded('Build')
-  jobs:
-  - template: .azure-pipelines/build-docker-sonic-vs-template.yml
-    parameters:
-      artifact_name: docker-sonic-vs
-
-- stage: Test
-  dependsOn: BuildDocker
-  condition: succeeded('BuildDocker')
-  jobs:
-  - template: .azure-pipelines/test-docker-sonic-vs-template.yml
-    parameters:
-      log_artifact_name: log

config/main.py

@@ -1796,11 +1796,11 @@ def add_portchannel_member(ctx, portchannel_name, port_name):
         ctx.fail("{} is not present.".format(portchannel_name))
 
     # Dont allow a port to be member of port channel if it is configured with an IP address
-    for key in db.get_table('INTERFACE').keys():
-        if type(key) != tuple:
+    for key,value in db.get_table('INTERFACE').items():
+        if type(key) == tuple:
             continue
-        if key[0] == port_name:
-            ctx.fail(" {} has ip address {} configured".format(port_name, key[1]))
+        if key == port_name:
+            ctx.fail(" {} has ip address configured".format(port_name))
             return
 
     # Dont allow a port to be member of port channel if it is configured as a VLAN member