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

Merge transformer phase 2 to arlo master #158

Merged
merged 9 commits into from
Oct 10, 2019
Merged

Merge transformer phase 2 to arlo master #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f131b5
support table transformer - GET case on leaf or nested container
amrutasali Oct 8, 2019
7a2353b
Get for sonic yang at instance level to return single instance data
ranjinidn Oct 9, 2019
e973031
Use new xpathPredicate function that removes augmented module name in…
ranjinidn Oct 9, 2019
b520bf5
Merge branch 'master' into transformer-phase2
ranjinidn Oct 9, 2019
9df719d
Add Copyright info
ranjinidn Oct 10, 2019
30e941a
Sonic yang restructuring fix terminal node leaf/leaf-list cases
amrutasali Oct 10, 2019
42a9b54
merge conflict resolution on xlate_to_db.go
amrutasali Oct 10, 2019
5226709
revert accidently added local changes in xspec.go
amrutasali Oct 10, 2019
032de57
Merge branch 'master' into transformer-phase2
ranjinidn Oct 10, 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
2 changes: 1 addition & 1 deletion models/yang/common/sonic-extensions.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module sonic-extensions {
description "Validation callpoint used to validate a YANG node during data translation back to YANG as a response to GET.";
}

extension redis-db-name {
extension db-name {
argument "db-name";
description "DB name that will indicate where data is stored. Eg: Config DB, App DB etc";
}
Expand Down
18 changes: 18 additions & 0 deletions src/translib/common_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package translib

import (
Expand Down
24 changes: 21 additions & 3 deletions src/translib/transformer/transformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package transformer

import (
Expand Down Expand Up @@ -30,8 +48,8 @@ func reportIfError(errs []error) {
}
}

func getOcModelsList () ([] string) {
var fileList [] string
func getOcModelsList () ([]string) {
var fileList []string
file, err := os.Open(YangPath + "models_list")
if err != nil {
return fileList
Expand All @@ -51,7 +69,7 @@ func getOcModelsList () ([] string) {
return fileList
}

func getDefaultModelsList () ([] string) {
func getDefaultModelsList () ([]string) {
var files []string
fileInfo, err := ioutil.ReadDir(YangPath)
if err != nil {
Expand Down
20 changes: 19 additions & 1 deletion src/translib/transformer/xconst.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package transformer

const (
Expand All @@ -7,7 +25,7 @@ const (
YANG_LEAF = "leaf"
YANG_LEAF_LIST = "leaflist"

YANG_ANNOT_DB_NAME = "redis-db-name"
YANG_ANNOT_DB_NAME = "db-name"
YANG_ANNOT_TABLE_NAME = "table-name"
YANG_ANNOT_FIELD_NAME = "field-name"
YANG_ANNOT_KEY_DELIM = "key-delimiter"
Expand Down
18 changes: 18 additions & 0 deletions src/translib/transformer/xfmr_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package transformer

import (
Expand Down
18 changes: 18 additions & 0 deletions src/translib/transformer/xfmr_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package transformer

import (
Expand Down
20 changes: 19 additions & 1 deletion src/translib/transformer/xlate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright 2019 Dell, Inc. //
// //
// Licensed under the Apache License, Version 2.0 (the "License"); //
// you may not use this file except in compliance with the License. //
// You may obtain a copy of the License at //
// //
// http://www.apache.org/licenses/LICENSE-2.0 //
// //
// Unless required by applicable law or agreed to in writing, software //
// distributed under the License is distributed on an "AS IS" BASIS, //
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
// See the License for the specific language governing permissions and //
// limitations under the License. //
// //
////////////////////////////////////////////////////////////////////////////////

package transformer

import (
Expand Down Expand Up @@ -331,7 +349,7 @@ func XlateFromDb(uri string, ygRoot *ygot.GoStruct, dbs [db.MaxDB]*db.DB, data m
}
}
} else {
xpath, _ := RemoveXPATHPredicates(uri)
xpath, _ := XfmrRemoveXPATHPredicates(uri)
if _, ok := xYangSpecMap[xpath]; ok {
cdb = xYangSpecMap[xpath].dbIndex
}
Expand Down
Loading