Fixes on OpenConfig and ACLs

Fixes on OpenConfig and ACLs

src/device/service/drivers/openconfig/templates/ACL/ACL_multivendor.py

@@ -35,11 +35,6 @@ LOG_ACTION_MAPPING = {
     'ACLLOGACTION_NOLOG'    : 'LOG_NONE',
     'ACLLOGACTION_SYSLOG'   : 'LOG_SYSLOG',
 }
-def acl_mgmt(parameters,vendor,delete):
-    acl   = []
-    acl.append(acl_set_mng(  parameters,vendor,delete))
-    acl.append(acl_interface(parameters,vendor,delete))
-    return acl
 
 def acl_set_mng(data,vendor, delete):
     doc, tag, text = Doc().tagtext()
@@ -179,6 +174,13 @@ def acl_interface(data,vendor, delete):
     )
     return result
 
+
+def acl_mgmt(parameters,vendor,delete):
+    acl   = []
+    acl.append(acl_set_mng(  parameters,vendor,delete))
+    acl.append(acl_interface(parameters,vendor,delete))
+    return acl
+
 # TESTING
 '''
 data = {'endpoint_id':{'device_id': {'device_uuid': {'uuid': 'R155'}},'endpoint_uuid':{'uuid':'eth-1/0/21.999'}},