Skip to content

Commit

Permalink
Merge branch 'master' into CLI_vnet_route_all_tunnel_route_status_add…
Browse files Browse the repository at this point in the history
…ition
  • Loading branch information
siqbal1986 authored Sep 15, 2022
2 parents bec449c + 1ac584b commit 4fa67ae
Show file tree
Hide file tree
Showing 95 changed files with 3,701 additions and 682 deletions.
Binary file removed .DS_Store
Binary file not shown.
Empty file added .bandit
Empty file.
20 changes: 20 additions & 0 deletions .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This workflow is to do the bandit check
#

name: bandit
on:
pull_request:
types:
- opened
- reopened
- synchronize

jobs:
bendit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: bandit
uses: jpetrucciani/bandit-check@master
with:
path: '.'
3 changes: 2 additions & 1 deletion acl_loader/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import ipaddress
import json
import syslog
import operator

import openconfig_acl
import tabulate
Expand Down Expand Up @@ -758,7 +759,7 @@ def incremental_update(self):
namespace_configdb.mod_entry(self.ACL_RULE, key, None)

for key in existing_controlplane_rules:
if cmp(self.rules_info[key], self.rules_db_info[key]) != 0:
if not operator.eq(self.rules_info[key], self.rules_db_info[key]):
self.configdb.set_entry(self.ACL_RULE, key, self.rules_info[key])
# Program for per-asic namespace corresponding to front asic also if present.
# For control plane ACL it's not needed but to keep all db in sync program everywhere
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ resources:
repositories:
- repository: sonic-swss
type: github
name: Azure/sonic-swss
endpoint: build
name: sonic-net/sonic-swss
endpoint: sonic-net

stages:
- stage: Build
Expand Down
Loading

0 comments on commit 4fa67ae

Please sign in to comment.