Revert "[Yang model] add Restapi yang file (#12287)" (#12374)

This is causing a build failure for all builds. The PR build was incorrectly marked as passing due to a different build issue. libyang[0]: Regular expression "(/[a-zA-Z0-9_-.]+)*/([a-zA-Z0-9_-.]+)./[a-z]{3}" is not valid (".]+)*/([a-zA-Z0-9_-.]+)./[a-z]{3})$": range out of order in character class). libyang[0]: Module "sonic-restapi" parsing failed. ERROR:YANG-TEST: Exception >Module "sonic-restapi" parsing failed.< in /sonic/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py:114 ERROR:YANG-TEST: Exception >Module "sonic-restapi" parsing failed.< in /sonic/src/sonic-yang-models/tests/yang_model_test This reverts commit e176512.
sonic-net · Oct 12, 2022 · 7087763 · 7087763
1 parent 34f9a64
commit 7087763
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 121 deletions.
diff --git a/src/sonic-restapi b/src/sonic-restapi
diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
@@ -46,7 +46,6 @@ Table of Contents
          * [Scheduler](#scheduler)  
          * [Port QoS Map](#port-qos-map)  
          * [Queue](#queue)  
-         * [Restapi](#restapi)  
          * [Tacplus Server](#tacplus-server)    
          * [TC to Priority group map](#tc-to-priority-group-map)  
          * [TC to Queue map](#tc-to-queue-map)    
@@ -1412,18 +1411,6 @@ name as object key and member list as attribute.
 }
 ```
 
-### Restapi
-```
-{
-"RESTAPI": {
-    "certs": {
-        "ca_crt": "/etc/sonic/credentials/ame_root.pem",
-        "server_key": "/etc/sonic/credentials/restapiserver.key",
-        "server_crt": "/etc/sonic/credentials/restapiserver.crt",
-        "client_crt_cname": "client.sonic.net"
-    }
-}
-```
 
 ### Tacplus Server
 

diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
@@ -148,7 +148,6 @@ def run(self):
                          './yang-models/sonic-scheduler.yang',
                          './yang-models/sonic-wred-profile.yang',
                          './yang-models/sonic-queue.yang',
-                         './yang-models/sonic-restapi.yang',
                          './yang-models/sonic-dscp-fc-map.yang',
                          './yang-models/sonic-exp-fc-map.yang',
                          './yang-models/sonic-dscp-tc-map.yang',

diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1118,14 +1118,6 @@
 		"port": "50051"
 	    }
         },
-        "RESTAPI": {
-            "certs": {
-                "ca_crt": "/etc/sonic/credentials/ame_root.pem",
-                "server_key": "/etc/sonic/credentials/restapiserver.key",
-                "server_crt": "/etc/sonic/credentials/restapiserver.crt",
-                "client_crt_cname": "client.sonic.net"
-            }
-         },
         "FLEX_COUNTER_TABLE": {
             "PFCWD": {
                 "FLEX_COUNTER_STATUS": "enable"

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/restapi.json b/src/sonic-yang-models/tests/yang_model_tests/tests/restapi.json
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/restapi.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/restapi.json
diff --git a/src/sonic-yang-models/yang-models/sonic-restapi.yang b/src/sonic-yang-models/yang-models/sonic-restapi.yang
+11 −5		Dockerfile
+10 −5		Dockerfile.build
+0 −1		Dockerfile.common.prod
+11 −5		Dockerfile.test
+1 −1		azurepipeline.yml
+1 −2		build.sh
+0 −32		copy.py
+0 −1		copy.sh
+0 −18		dependencies.conf
+38 −212		go-server-server/go/default.go
+3 −50		go-server-server/go/models.go
+16 −25		go-server-server/go/persistent.go
+0 −14		go-server-server/go/routers.go
+0 −57		go-server-server/go/util.go
+1 −78		sonic_api.yaml
+0 −7		test/restapi_client.py
+5 −607		test/test_restapi.py