Skip to content

Commit 8e3c120

Browse files
dutta-parthadutta-partha
authored
Merge pull request #321 from project-arlo/release_1.0
Rebase from Release 1.0
2 parents d97e540 + 38b31e2 commit 8e3c120

File tree

5 files changed

+50
-18
lines changed

5 files changed

+50
-18
lines changed

‎Makefile

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,40 @@ REST_BIN = $(BUILD_DIR)/rest_server/main
5757
CERTGEN_BIN = $(BUILD_DIR)/rest_server/generate_cert
5858

5959

60-
all: build-deps go-deps go-redis-patch go-patch translib rest-server cli
60+
all: build-deps go-deps go-pkg-version go-patch translib rest-server cli
6161

6262
build-deps:
6363
mkdir -p $(BUILD_DIR)
6464

6565
go-deps: $(GO_DEPS_LIST)
6666

67-
go-redis-patch: go-deps
67+
go-pkg-version: go-deps
6868
cd $(BUILD_GOPATH)/src/github.com/go-redis/redis; git checkout d19aba07b47683ef19378c4a4d43959672b7cec8 2>/dev/null ; true; \
69-
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/go-redis/redis
69+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/go-redis/redis; \
70+
cd $(BUILD_GOPATH)/src/github.com/gorilla/mux; git checkout 49c01487a141b49f8ffe06277f3dca3ee80a55fa 2>/dev/null ; true; \
71+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/gorilla/mux; \
72+
cd $(BUILD_GOPATH)/src/github.com/Workiva/go-datastructures; git checkout f07cbe3f82ca2fd6e5ab94afce65fe43319f675f 2>/dev/null ; true; \
73+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/Workiva/go-datastructures; \
74+
cd $(BUILD_GOPATH)/src/github.com/golang/glog; git checkout 23def4e6c14b4da8ac2ed8007337bc5eb5007998 2>/dev/null ; true; \
75+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/golang/glog; \
76+
cd $(BUILD_GOPATH)/src/github.com/pkg/profile; git checkout acd64d450fd45fb2afa41f833f3788c8a7797219 2>/dev/null ; true; \
77+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/pkg/profile; \
78+
cd $(BUILD_GOPATH)/src/github.com/antchfx/jsonquery; git checkout 3535127d6ca5885dbf650204eb08eabf8374a274 2>/dev/null ; true; \
79+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/antchfx/jsonquery; \
80+
cd $(BUILD_GOPATH)/src/github.com/antchfx/xmlquery; git checkout 16f1e6cdc5fe44a7f8e2a8c9faf659a1b3a8fd9b 2>/dev/null ; true; \
81+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/antchfx/xmlquery; \
82+
cd $(BUILD_GOPATH)/src/github.com/facette/natsort; git checkout 2cd4dd1e2dcba4d85d6d3ead4adf4cfd2b70caf2 2>/dev/null ; true; \
83+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/facette/natsort; \
84+
cd $(BUILD_GOPATH)/src/github.com/philopon/go-toposort; git checkout 9be86dbd762f98b5b9a4eca110a3f40ef31d0375 2>/dev/null ; true; \
85+
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/philopon/go-toposort
7086

7187
$(GO_DEPS_LIST):
7288
$(GO) get -v $@
7389

7490
cli: rest-server
7591
$(MAKE) -C src/CLI
7692

77-
cvl: go-deps go-patch go-redis-patch
93+
cvl: go-deps go-patch go-pkg-version
7894
$(MAKE) -C src/cvl
7995
$(MAKE) -C src/cvl/schema
8096
$(MAKE) -C src/cvl/testdata/schema

‎debian/control

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ Priority: extra
1010
Architecture: amd64
1111
Depends: ${shlibs:Depends}, ${misc:Depends}
1212
Description: SONiC Management Framework
13+
14+
Package: sonic-mgmt-framework-dbg
15+
Priority: extra
16+
Architecture: amd64
17+
Section: debug
18+
Depends: sonic-mgmt-framework (=${binary:Version})
19+
Description: debugging symbols for SONiC Management Framework

‎models/yang/sonic/sonic-port.yang

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,28 @@ module sonic-port {
4444
}
4545

4646
leaf speed {
47-
type uint64;
47+
type uint64 {
48+
range "1000|10000|25000|40000|50000|100000|400000" {
49+
error-message "Invalid Ethernet interface speed";
50+
error-app-tag port-speed-invalid;
51+
}
52+
}
4853
}
4954

5055
leaf valid_speeds {
5156
type string;
5257
}
5358

5459
leaf alias {
55-
type string;
60+
type string {
61+
pattern '[ -~]{0,64}';
62+
}
5663
}
5764

5865
leaf description {
59-
type string;
66+
type string {
67+
pattern '[ -~]{0,64}';
68+
}
6069
}
6170

6271
leaf mtu{

‎src/CLI/actioner/sonic-cli.py renamed to ‎src/CLI/actioner/sonic-cli-acl.py

File renamed without changes.

‎src/CLI/clitree/cli-xml/acl.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ limitations under the License.
3737
</PARAM>
3838
<ACTION>
3939
if test "${access-list-name}" = ""; then&#xA;
40-
python $SONIC_CLI_ROOT/sonic-cli.py get_openconfig_acl_acl_acl_sets show_access_list.j2&#xA;
40+
python $SONIC_CLI_ROOT/sonic-cli-acl.py get_openconfig_acl_acl_acl_sets show_access_list.j2&#xA;
4141
else&#xA;
42-
python $SONIC_CLI_ROOT/sonic-cli.py get_openconfig_acl_acl_acl_sets_acl_set_acl_entries ${access-list-name} ACL_IPV4 show_access_list.j2&#xA;
42+
python $SONIC_CLI_ROOT/sonic-cli-acl.py get_openconfig_acl_acl_acl_sets_acl_set_acl_entries ${access-list-name} ACL_IPV4 show_access_list.j2&#xA;
4343
fi&#xA;
4444
</ACTION>
4545
</COMMAND>
@@ -51,7 +51,7 @@ limitations under the License.
5151
help="Show IPv4 access-group information"
5252
>
5353
<ACTION>
54-
python $SONIC_CLI_ROOT/sonic-cli.py get_openconfig_acl_acl_interfaces show_access_group.j2
54+
python $SONIC_CLI_ROOT/sonic-cli-acl.py get_openconfig_acl_acl_interfaces show_access_group.j2
5555
</ACTION>
5656
</COMMAND>
5757

@@ -70,9 +70,9 @@ limitations under the License.
7070

7171
<ACTION>
7272
if test "${direction-switch}" = "in"; then&#xA;
73-
python $SONIC_CLI_ROOT/sonic-cli.py patch_list_openconfig_acl_acl_interfaces_interface ${access-list-name} ACL_IPV4 ${iface} ingress&#xA;
73+
python $SONIC_CLI_ROOT/sonic-cli-acl.py patch_list_openconfig_acl_acl_interfaces_interface ${access-list-name} ACL_IPV4 ${iface} ingress&#xA;
7474
else&#xA;
75-
python $SONIC_CLI_ROOT/sonic-cli.py patch_list_openconfig_acl_acl_interfaces_interface ${access-list-name} ACL_IPV4 ${iface} egress&#xA;
75+
python $SONIC_CLI_ROOT/sonic-cli-acl.py patch_list_openconfig_acl_acl_interfaces_interface ${access-list-name} ACL_IPV4 ${iface} egress&#xA;
7676
fi&#xA;
7777
</ACTION>
7878
</COMMAND>
@@ -87,9 +87,9 @@ limitations under the License.
8787

8888
<ACTION>
8989
if test "${direction-switch}" = "in"; then&#xA;
90-
python $SONIC_CLI_ROOT/sonic-cli.py delete_openconfig_acl_acl_interfaces_interface_ingress_acl_sets_ingress_acl_set ${iface} ${access-list-name} ACL_IPV4&#xA;
90+
python $SONIC_CLI_ROOT/sonic-cli-acl.py delete_openconfig_acl_acl_interfaces_interface_ingress_acl_sets_ingress_acl_set ${iface} ${access-list-name} ACL_IPV4&#xA;
9191
else&#xA;
92-
python $SONIC_CLI_ROOT/sonic-cli.py delete_openconfig_acl_acl_interfaces_interface_egress_acl_sets_egress_acl_set ${iface} ${access-list-name} ACL_IPV4&#xA;
92+
python $SONIC_CLI_ROOT/sonic-cli-acl.py delete_openconfig_acl_acl_interfaces_interface_egress_acl_sets_egress_acl_set ${iface} ${access-list-name} ACL_IPV4&#xA;
9393
fi&#xA;
9494
</ACTION>
9595
</COMMAND>
@@ -111,7 +111,7 @@ limitations under the License.
111111
ptype="STRING_63"
112112
>
113113
</PARAM>
114-
<ACTION>python $SONIC_CLI_ROOT/sonic-cli.py patch_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
114+
<ACTION>python $SONIC_CLI_ROOT/sonic-cli-acl.py patch_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
115115
</COMMAND>
116116

117117
<!-- no ip access-list -->
@@ -123,7 +123,7 @@ limitations under the License.
123123
ptype="STRING_63"
124124
>
125125
</PARAM>
126-
<ACTION>python $SONIC_CLI_ROOT/sonic-cli.py delete_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
126+
<ACTION>python $SONIC_CLI_ROOT/sonic-cli-acl.py delete_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
127127
</COMMAND>
128128

129129
</VIEW>
@@ -159,7 +159,7 @@ limitations under the License.
159159
help="Sequence number"
160160
ptype="RANGE_1_65535"
161161
/>
162-
<ACTION>python $SONIC_CLI_ROOT/sonic-cli.py delete_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${seq-no}</ACTION>
162+
<ACTION>python $SONIC_CLI_ROOT/sonic-cli-acl.py delete_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${seq-no}</ACTION>
163163
</COMMAND>
164164

165165
<COMMAND
@@ -210,7 +210,7 @@ limitations under the License.
210210
</PARAM>
211211
</PARAM>
212212
<ACTION>
213-
python $SONIC_CLI_ROOT/sonic-cli.py patch_list_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${__params}
213+
python $SONIC_CLI_ROOT/sonic-cli-acl.py patch_list_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${__params}
214214
</ACTION>
215215
</COMMAND>
216216
</VIEW>

0 commit comments

Comments
 (0)