[#3583] Added syntax UTs

Author: fxdupont

src/bin/dhcp4/tests/classify_unittest.cc

@@ -1752,7 +1752,7 @@ TEST_F(ClassifyTest, vendorOptionClassTagTest) {
             "code": 103,
             "type": "string"
         }],
-        "option-data": [{ 
+        "option-data": [{
             "space": "vendor-4491",
             "code": 101,
             "csv-format": true,
@@ -1801,7 +1801,7 @@ TEST_F(ClassifyTest, vendorOptionClassTagTest) {
     // Add the ORO sub-option requesting all three sub-options.
     boost::shared_ptr<OptionUint8Array> vendor_oro(new OptionUint8Array(Option::V4,
                                                                         DOCSIS3_V4_ORO));
-    vendor_oro->addValue(101); 
+    vendor_oro->addValue(101);
     vendor_oro->addValue(102);
     vendor_oro->addValue(103);
     vendor->addOption(vendor_oro);
@@ -1832,7 +1832,7 @@ TEST_F(ClassifyTest, vendorOptionClassTagTest) {
     EXPECT_TRUE(vendor_resp->getOption(103));
 }
 
-// Verifies that a requested VIVCO suboption can be gated by 
+// Verifies that a requested VIVCO suboption can be gated by
 // option class tagging.
 TEST_F(ClassifyTest, vivcoOptionClassTagTest) {
     IfaceMgrTestConfig test_config(true);
@@ -1926,7 +1926,7 @@ TEST_F(ClassifyTest, vivcoOptionClassTagTest) {
     ASSERT_FALSE(tmp);
 }
 
-// Verifies that requested VIVSO suboption can be gated by 
+// Verifies that requested VIVSO suboption can be gated by
 // option class tagging.
 TEST_F(ClassifyTest, vivsoOptionClassTagTest) {
     IfaceMgrTestConfig test_config(true);
@@ -2105,7 +2105,7 @@ TEST_F(ClassifyTest, basicOptionClassTagTest) {
     tmp = response1->getOption(DHO_DOMAIN_NAME_SERVERS);
     EXPECT_TRUE(tmp);
 
-    // Verify that server id is present and is the configured value. 
+    // Verify that server id is present and is the configured value.
     checkServerIdentifier(response1, "192.0.2.0");
 
     // Try again with a client id that does not match "melon".

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -8013,7 +8013,71 @@ TEST_F(Dhcp4ParserTest, storeDdnsConflictResolutionMode) {
     }
 }
 
-//This test verifies that duplicates in option-data.client-classes
+// This test verifies that class tagging can occur at any scope.
+TEST_F(Dhcp4ParserTest, classTagging) {
+    std::string config = "{ " + genIfaceConfig() + ","
+        R"^(
+        "option-data": [{
+             "name": "domain-name",
+             "data": "example.com",
+             "client-classes": [ "in-global" ]
+        }],
+        "valid-lifetime": 4000,
+        "rebind-timer": 2000,
+        "renew-timer": 1000,
+        "shared-networks": [{
+            "name": "foo",
+            "subnet4": [{
+                "id": 1,
+                "subnet": "192.0.2.0/24",
+                "option-data": [{
+                    "name": "domain-name",
+                    "data": "example.com",
+                    "client-classes": [ "in-subnet" ]
+                }],
+                "pools": [{
+                    "pool": "192.0.2.0/28",
+                    "option-data": [{
+                        "name": "domain-name",
+                        "data": "example.com",
+                        "client-classes": [ "in-pool" ]
+                     }]
+                }],
+                "reservations": [{
+                    "hw-address": "AA:BB:CC:DD:EE:FF",
+                    "option-data": [{
+                        "name": "domain-name",
+                        "data": "example.com",
+                        "client-classes": [ "in-reservation" ]
+                    }]
+               }]
+            }],
+            "option-data": [{
+                "name": "domain-name",
+                "data": "example.com",
+                "client-classes": [ "in-network" ]
+            }]
+        }],
+        "client-classes": [{
+            "name": "foo",
+            "option-data": [{
+                "name": "domain-name",
+                "data": "example.com",
+                "client-classes": [ "in-class" ]
+            }]
+        }]
+        })^";
+
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP4(config));
+    extractConfig(config);
+
+    ConstElementPtr status;
+    ASSERT_NO_THROW(status = configureDhcp4Server(*srv_, json));
+    checkResult(status, 0);
+}
+
+// This test verifies that duplicates in option-data.client-classes
 // are ignored and do not affect class order.
 TEST_F(Dhcp4ParserTest, optionClientClassesDuplicateCheck) {
     std::string config = "{ " + genIfaceConfig() + ","