Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase from Release 1.0 #321

Merged
merged 4 commits into from
Dec 5, 2019
Merged

Rebase from Release 1.0 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20869c8
Merge pull request #278 from project-arlo/cvl_sonic_yang_changes_rel_1.0
dutta-partha Nov 15, 2019
ed8d2ba
Add validation for speed and description (#291)
joyas-joseph Nov 20, 2019
6190029
Updated the Makefile to have go pkg version, and renamed the ACL CLI …
mbalachandar Nov 21, 2019
38b31e2
Update control
PrabhuSreenivasan Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,40 @@ REST_BIN = $(BUILD_DIR)/rest_server/main
CERTGEN_BIN = $(BUILD_DIR)/rest_server/generate_cert


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

build-deps:
mkdir -p $(BUILD_DIR)

go-deps: $(GO_DEPS_LIST)

go-redis-patch: go-deps
go-pkg-version: go-deps
cd $(BUILD_GOPATH)/src/github.com/go-redis/redis; git checkout d19aba07b47683ef19378c4a4d43959672b7cec8 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/go-redis/redis
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/go-redis/redis; \
cd $(BUILD_GOPATH)/src/github.com/gorilla/mux; git checkout 49c01487a141b49f8ffe06277f3dca3ee80a55fa 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/gorilla/mux; \
cd $(BUILD_GOPATH)/src/github.com/Workiva/go-datastructures; git checkout f07cbe3f82ca2fd6e5ab94afce65fe43319f675f 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/Workiva/go-datastructures; \
cd $(BUILD_GOPATH)/src/github.com/golang/glog; git checkout 23def4e6c14b4da8ac2ed8007337bc5eb5007998 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/golang/glog; \
cd $(BUILD_GOPATH)/src/github.com/pkg/profile; git checkout acd64d450fd45fb2afa41f833f3788c8a7797219 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/pkg/profile; \
cd $(BUILD_GOPATH)/src/github.com/antchfx/jsonquery; git checkout 3535127d6ca5885dbf650204eb08eabf8374a274 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/antchfx/jsonquery; \
cd $(BUILD_GOPATH)/src/github.com/antchfx/xmlquery; git checkout 16f1e6cdc5fe44a7f8e2a8c9faf659a1b3a8fd9b 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/antchfx/xmlquery; \
cd $(BUILD_GOPATH)/src/github.com/facette/natsort; git checkout 2cd4dd1e2dcba4d85d6d3ead4adf4cfd2b70caf2 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/facette/natsort; \
cd $(BUILD_GOPATH)/src/github.com/philopon/go-toposort; git checkout 9be86dbd762f98b5b9a4eca110a3f40ef31d0375 2>/dev/null ; true; \
$(GO) install -v -gcflags "-N -l" $(BUILD_GOPATH)/src/github.com/philopon/go-toposort

$(GO_DEPS_LIST):
$(GO) get -v $@

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

cvl: go-deps go-patch go-redis-patch
cvl: go-deps go-patch go-pkg-version
$(MAKE) -C src/cvl
$(MAKE) -C src/cvl/schema
$(MAKE) -C src/cvl/testdata/schema
Expand Down
7 changes: 7 additions & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ Priority: extra
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: SONiC Management Framework

Package: sonic-mgmt-framework-dbg
Priority: extra
Architecture: amd64
Section: debug
Depends: sonic-mgmt-framework (=${binary:Version})
Description: debugging symbols for SONiC Management Framework
15 changes: 12 additions & 3 deletions models/yang/sonic/sonic-port.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,28 @@ module sonic-port {
}

leaf speed {
type uint64;
type uint64 {
range "1000|10000|25000|40000|50000|100000|400000" {
error-message "Invalid Ethernet interface speed";
error-app-tag port-speed-invalid;
}
}
}

leaf valid_speeds {
type string;
}

leaf alias {
type string;
type string {
pattern '[ -~]{0,64}';
}
}

leaf description {
type string;
type string {
pattern '[ -~]{0,64}';
}
}

leaf mtu{
Expand Down
0 src/CLI/actioner/sonic-cli.py → src/CLI/actioner/sonic-cli-acl.py
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions src/CLI/clitree/cli-xml/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ limitations under the License.
</PARAM>
<ACTION>
if test "${access-list-name}" = ""; then&#xA;
python $SONIC_CLI_ROOT/sonic-cli.py get_openconfig_acl_acl_acl_sets show_access_list.j2&#xA;
python $SONIC_CLI_ROOT/sonic-cli-acl.py get_openconfig_acl_acl_acl_sets show_access_list.j2&#xA;
else&#xA;
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;
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;
fi&#xA;
</ACTION>
</COMMAND>
Expand All @@ -51,7 +51,7 @@ limitations under the License.
help="Show IPv4 access-group information"
>
<ACTION>
python $SONIC_CLI_ROOT/sonic-cli.py get_openconfig_acl_acl_interfaces show_access_group.j2
python $SONIC_CLI_ROOT/sonic-cli-acl.py get_openconfig_acl_acl_interfaces show_access_group.j2
</ACTION>
</COMMAND>

Expand All @@ -70,9 +70,9 @@ limitations under the License.

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

<ACTION>
if test "${direction-switch}" = "in"; then&#xA;
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;
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;
else&#xA;
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;
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;
fi&#xA;
</ACTION>
</COMMAND>
Expand All @@ -111,7 +111,7 @@ limitations under the License.
ptype="STRING_63"
>
</PARAM>
<ACTION>python $SONIC_CLI_ROOT/sonic-cli.py patch_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
<ACTION>python $SONIC_CLI_ROOT/sonic-cli-acl.py patch_openconfig_acl_acl_acl_sets_acl_set ${access-list-name} ACL_IPV4</ACTION>
</COMMAND>

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

</VIEW>
Expand Down Expand Up @@ -159,7 +159,7 @@ limitations under the License.
help="Sequence number"
ptype="RANGE_1_65535"
/>
<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>
<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>
</COMMAND>

<COMMAND
Expand Down Expand Up @@ -210,7 +210,7 @@ limitations under the License.
</PARAM>
</PARAM>
<ACTION>
python $SONIC_CLI_ROOT/sonic-cli.py patch_list_openconfig_acl_acl_acl_sets_acl_set_acl_entries_acl_entry ${name} ACL_IPV4 ${__params}
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}
</ACTION>
</COMMAND>
</VIEW>
Expand Down