Merge branch 'master' into 'master'

关于QoS分类的习题

See merge request !25

data/2.网络中阶/2.路由/3.ISIS/01.json

+{
+  "type": "code_options",
+  "author": "Bibabu330",
+  "source": "01.md",
+  "notebook_enable": false,
+  "exercise_id": "6ceb5956ed06417899a82ed29213870e"
+}
\ No newline at end of file

data/2.网络中阶/2.路由/3.ISIS/02.json

+{
+  "type": "code_options",
+  "author": "Bibabu330",
+  "source": "02.md",
+  "notebook_enable": false,
+  "exercise_id": "aa35d4db176e44c2b077efb2af00b36b"
+}
\ No newline at end of file

data/2.网络中阶/2.路由/3.ISIS/03.json

+{
+  "type": "code_options",
+  "author": "Bibabu330",
+  "source": "03.md",
+  "notebook_enable": false,
+  "exercise_id": "827a7a93975c48e092d189f81a06b34e"
+}
\ No newline at end of file

data/2.网络中阶/2.路由/3.ISIS/config.json

 {
   "node_id": "network-872fb874602d49aeaf479aa555f768f7",
-  "keywords": ["ISIS"],
+  "keywords": [
+    "ISIS"
+  ],
   "children": [],
-  "export": [],
+  "export": [
+    "01.json",
+    "02.json",
+    "03.json"
+  ],
   "keywords_must": [],
   "keywords_forbid": []
 }
\ No newline at end of file

data/2.网络中阶/2.路由/4.BGP/01.md

@@ -14,7 +14,7 @@ RIG
 
 ### B
 
-BGP
+IS-IS
 
 ### C
 

data/2.网络中阶/2.路由/4.BGP/02.md

@@ -10,7 +10,7 @@ BGP采用TCP方式发送路由协议信息
 
 ### A
 
-BGP采用TCP方式发送路由协议信息
+BGP不能发布直连路由
 
 ### B
 

data/2.网络中阶/2.路由/4.BGP/03.md

@@ -18,4 +18,4 @@ BGP的路由聚合可能会改变原有的AS-Path属性
 
 ### C
 
-BGP的路由聚合可能会改变原有的AS-Path属性
\ No newline at end of file
+在Origin属性中，优先选择EGP属性的路由
\ No newline at end of file

data/2.网络中阶/2.路由/4.BGP/config.json

@@ -7,6 +7,6 @@
     "02.json",
     "03.json"
   ],
-  "keywords_must": [],
-  "keywords_forbid": []
+  "keywords_must": ["BGP","自治系统间的路由协议","边界网关协议"],
+  "keywords_forbid": ["RIP","OSPF","内部网关协议"]
 }
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/01.json

+{
+  "type": "code_options",
+  "author": "Jason_Zhou1",
+  "source": "01.md",
+  "notebook_enable": false,
+  "exercise_id": "ff8c59347ac8481593778e0ba3c5d440"
+}
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/01.md

+# QoS
+
+关于Qos分类说法错误的是()
+
+## 答案
+
+分类发生在端口输出报文阶段
+
+## 选项
+
+### A
+
+优先级分类根据各种网络所关注的业务类型已经出现多种不同的标准
+
+### B
+
+分类动作的核心任务是确定输入报文的CoS值
+
+### C
+
+支持QoS功能的设备，能够提供传输品质服务
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/02.json

+{
+  "type": "code_options",
+  "author": "Jason_Zhou1",
+  "source": "02.md",
+  "notebook_enable": false,
+  "exercise_id": "f7f359c711c44b64ac11bb6a90f5c7f0"
+}
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/02.md

+# QoS
+
+以下哪个不是RFC定义的四类标准的PHB()
+
+## 答案
+
+DS
+
+## 选项
+
+### A
+
+CS
+
+### B
+
+EF
+
+### C
+
+AF
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/03.json

+{
+  "type": "code_options",
+  "author": "Jason_Zhou1",
+  "source": "03.md",
+  "notebook_enable": false,
+  "exercise_id": "be7a31298fa148d28d2b37dc5b6027a7"
+}
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/03.md

+# QoS
+
+下列关于QoS分类说法错误的是()
+
+## 答案
+
+DSCP一共采用了4bit作为QoS标识
+
+## 选项
+
+### A
+
+Classifier分类是QoS的一种分类方法
+
+### B
+
+根据协议对数据包进行识别和优先级处理可以降低延迟
+
+### C
+
+通过检查IP数据包的端口号码，智能网络可以确定数据包是由哪类应用产生的
\ No newline at end of file

data/3.网络高阶/3.QoS/2.QoS分类/config.json

 {
   "node_id": "network-c0196e2fe2e846bc8a4c9bb338221528",
-  "keywords": ["Qos分类"],
+  "keywords": [
+    "Qos分类"
+  ],
   "children": [],
-  "export": [],
-  "keywords_must": [],
-  "keywords_forbid": []
+  "export": [
+    "01.json",
+    "02.json",
+    "03.json"
+  ],
+  "keywords_must": [
+    "QoS",
+    "服务质量"
+  ],
+  "keywords_forbid": [
+    "QoE"
+  ]
 }
\ No newline at end of file

data/tree.json

@@ -870,62 +870,7 @@
                       "keywords": [
                         "OSPF"
                       ],
-                      "children": [
-                        {
-                          "OSPF的分组类型": {
-                            "keywords": [
-                              "问候（Hello）分组",
-                              "数据库描述（Database Description）分组",
-                              "链路状态请求（Link State Request）分组",
-                              "链路状态更新（Link State Update）分组",
-                              "链路状态确认（Link State Acknowledgment）分组"
-                            ],
-                            "children": [],
-                            "node_id": "network-287f3747a4e144a2b87abb6baf69bfd2"
-                          }
-                        },
-                        {
-                          "对于规模很大的网络，OSPF通过划分区域来提高路由更新收敛速度": {
-                            "keywords": [
-                              "网络规模大",
-                              "区域划分",
-                              "提高路由更新收敛速度"
-                            ],
-                            "children": [],
-                            "node_id": "network-9c88a22b792842cbb608c9463b4f4453"
-                          }
-                        },
-                        {
-                          "OSPF区域标识符": {
-                            "keywords": [
-                              "32位区域标识符"
-                            ],
-                            "children": [],
-                            "node_id": "network-148b17c8c7104127ba329867a6a28ee9"
-                          }
-                        },
-                        {
-                          "OSPF区域划分": {
-                            "keywords": [
-                              "一个OSPF区域内的路由器不知道其他区域的网络拓扑的情况",
-                              "一个OSPF区域内的路由器最好不超过200个"
-                            ],
-                            "children": [],
-                            "node_id": "network-57f4117b6d2b44d0bb1350ea518a0efa"
-                          }
-                        },
-                        {
-                          "OSPF协议": {
-                            "keywords": [
-                              "分布式链路状态协议",
-                              "洪范法",
-                              "链路状态数据库是全网的拓扑结构图"
-                            ],
-                            "children": [],
-                            "node_id": "network-2cb11b24d6f34cdc84f4c0f8d107c4cf"
-                          }
-                        }
-                      ],
+                      "children": [],
                       "keywords_must": [],
                       "keywords_forbid": []
                     }
@@ -948,8 +893,16 @@
                         "BGP"
                       ],
                       "children": [],
-                      "keywords_must": [],
-                      "keywords_forbid": []
+                      "keywords_must": [
+                        "BGP",
+                        "自治系统间的路由协议",
+                        "边界网关协议"
+                      ],
+                      "keywords_forbid": [
+                        "RIP",
+                        "OSPF",
+                        "内部网关协议"
+                      ]
                     }
                   },
                   {
@@ -1082,8 +1035,13 @@
                         "Qos分类"
                       ],
                       "children": [],
-                      "keywords_must": [],
-                      "keywords_forbid": []
+                      "keywords_must": [
+                        "QoS",
+                        "服务质量"
+                      ],
+                      "keywords_forbid": [
+                        "QoE"
+                      ]
                     }
                   }
                 ],