bbf: upgrade to 2.14

README.md

@@ -225,14 +225,14 @@ It is a generator of json file from xml data model and C source code.
 $ python generate_json.py
 Usage: generate_json.py <tr-xxx cwmp xml data model> <tr-xxx usp xml data model> [Object path]
 Examples:
-  - generate_json.py tr-181-2-13-0-cwmp-full.xml tr-181-2-13-0-usp-full.xml Device.
+  - generate_json.py tr-181-2-14-1-cwmp-full.xml tr-181-2-14-1-usp-full.xml Device.
     ==> Generate the json file of the sub tree Device. in tr181.json
   - generate_json.py tr-104-2-0-2-cwmp-full.xml tr-104-2-0-2-usp-full.xml Device.Services.VoiceService.
     ==> Generate the json file of the sub tree Device.Services.VoiceService. in tr104.json
   - generate_json.py tr-106-1-2-0-full.xml Device.
     ==> Generate the json file of the sub tree Device. in tr106.json
 
-Example of xml data model file: https://www.broadband-forum.org/cwmp/tr-181-2-13-0-cwmp-full.xml
+Example of xml data model file: https://www.broadband-forum.org/cwmp/tr-181-2-14-1-cwmp-full.xml
 ```
 
 #### Excel generator: ####

dmtree/tr181/datamodelversion.c

@@ -12,6 +12,6 @@
 
 int get_Device_RootDataModelVersion(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = "2.13";
+	*value = "2.14";
 	return 0;
 }

dmtree/tr181/deviceinfo.c

@@ -52,8 +52,8 @@ static const struct fw_image fw_images[] = {
 };
 
 struct Supported_Data_Models Data_Models[] = {
-{"http://www.broadband-forum.org/cwmp/tr-181-2-13-0.xml","urn:broadband-forum-org:tr-181-2-13-0","IP,Wireless,Firewall,NAT,DHCP,QoS,DNS,GRE,UPnP"},
-{"http://www.broadband-forum.org/cwmp/tr-104-1-1-0.xml","urn:broadband-forum-org:tr-104-1-1-0", "VoiceService"},
+{"http://www.broadband-forum.org/cwmp/tr-181-2-14-1.xml","urn:broadband-forum-org:tr-181-2-14-1","IP,Wireless,Firewall,NAT,DHCP,QoS,DNS,GRE,UPnP"},
+{"http://www.broadband-forum.org/cwmp/tr-104-2-0-2.xml","urn:broadband-forum-org:tr-104-2-0-2", "VoiceService"},
 {"http://www.broadband-forum.org/cwmp/tr-143-1-1-0.xml","urn:broadband-forum-org:tr-143-1-1-0", "Ping,TraceRoute,Download,Upload,UDPecho,ServerSelectionDiag"},
 {"http://www.broadband-forum.org/cwmp/tr-157-1-3-0.xml","urn:broadband-forum-org:tr-157-1-3-0", "Bulkdata,SoftwareModules"},
 };

tools/generate_json.py

@@ -592,14 +592,14 @@ def printCOMMAND( dmparam, dmobject, bbfdm_type ):
 def printusage():
 	print("Usage: " + sys.argv[0] + " <tr-xxx cwmp xml data model> <tr-xxx usp xml data model> [Object path]")
 	print("Examples:")
-	print("  - " + sys.argv[0] + " tr-181-2-13-0-cwmp-full.xml tr-181-2-13-0-usp-full.xml Device.")
+	print("  - " + sys.argv[0] + " tr-181-2-14-1-cwmp-full.xml tr-181-2-14-1-usp-full.xml Device.")
 	print("    ==> Generate the json file of the sub tree Device. in tr181.json")
 	print("  - " + sys.argv[0] + " tr-104-2-0-2-cwmp-full.xml tr-104-2-0-2-usp-full.xml Device.Services.VoiceService.")
 	print("    ==> Generate the json file of the sub tree Device.Services.VoiceService. in tr104.json")
 	print("  - " + sys.argv[0] + " tr-106-1-2-0-full.xml Device.")
 	print("    ==> Generate the json file of the sub tree Device. in tr106.json")
 	print("")
-	print("Example of xml data model file: https://www.broadband-forum.org/cwmp/tr-181-2-13-0-cwmp-full.xml")
+	print("Example of xml data model file: https://www.broadband-forum.org/cwmp/tr-181-2-14-1-cwmp-full.xml")
 	exit(1)
 
 def getobjectpointer( objname ):

tools/generate_xml_bbf.sh

@@ -377,10 +377,10 @@ SCRIPTS_PATH_TR104=${DM_PATH}/${DM_TR104}
 SCRIPTS_PATH_TR143=${DM_PATH}/${DM_TR143}
 DIR_LIST="$SCRIPTS_PATH_TR181 $SCRIPTS_PATH_TR104 $SCRIPTS_PATH_TR143"
 ROOT_PATH="Device"
-DM_HEAD="$ROOT_PATH-2.13"
-DM_FILE="tr-181-2-13-0-cwmp-full.xml"
-DM_VERSION="tr-181-2-13-0-cwmp"
-MODEL_NAME="$ROOT_PATH:2.13"
+DM_HEAD="$ROOT_PATH-2.14"
+DM_FILE="tr-181-2-14-1-cwmp-full.xml"
+DM_VERSION="tr-181-2-14-1-cwmp"
+MODEL_NAME="$ROOT_PATH:2.14"
 XML_OUT_STREAM_BBF="iopsys_bbf.xml"
 
 # read the options