Merge "Fix collector crash due to non ASCII character" into R3.2

src/analytics/parser_util.cc

@@ -31,8 +31,8 @@ LineParser::GetAtrributes(const pugi::xml_node &node,
      bool r=true;
      for (pugi::xml_attribute attr = node.first_attribute(); attr;
              attr = attr.next_attribute()) {
-         std::string s =  boost::algorithm::to_lower_copy(std::string(
-                     attr.value()));
+         std::string s =  MakeSane(boost::algorithm::to_lower_copy(std::string(
+                     attr.value())));
          if (!s.empty()) {
              r &= ParseDoc(s.begin(), s.end(), words);
          }
@@ -51,8 +51,8 @@ LineParser::Traverse(const pugi::xml_node &node,
         if (check_attr)
             r &= GetAtrributes(node, words);
     } else if (type == pugi::node_pcdata || type == pugi::node_cdata) {
-         std::string s =  boost::algorithm::to_lower_copy(std::string(
-                     node.value()));
+         std::string s =  MakeSane(boost::algorithm::to_lower_copy(std::string(
+                     node.value())));
          if (!s.empty()) {
              r &= ParseDoc(s.begin(), s.end(), words);
          }
@@ -76,7 +76,7 @@ LineParser::ParseXML(const pugi::xml_node &node,
 
 bool
 LineParser::Parse(std::string s, LineParser::WordListType *words) {
-    std::string ls = boost::algorithm::to_lower_copy(s);
+    std::string ls = MakeSane(boost::algorithm::to_lower_copy(s));
     return ParseDoc(ls.begin(), ls.end(), words);
 }
 

src/opserver/test/test_analytics_sys.py

@@ -475,9 +475,31 @@ def test_11_verify_syslog_table_query(self):
         line = 'football ' + chr(201) + chr(203) + chr(70) + ' and baseball'
         syslogger.critical(line)
         assert vizd_obj.verify_keyword_query(line, ['football', 'baseball'])
-
     # end test_11_verify_syslog_table_query
 
+    #@unittest.skip('verify message non ascii')
+    def test_12_verify_message_non_ascii(self):
+        '''
+        This test verifies message sent with non ascii character does not
+        crash vizd.
+        '''
+        logging.info('%%% test_12_verify_message_non_ascii %%%')
+        analytics = self.useFixture(
+            AnalyticsFixture(logging, builddir,
+                             self.__class__.redis_port,
+                             self.__class__.cassandra_port))
+        assert analytics.verify_on_setup()
+        collectors = [analytics.get_collector()]
+        generator_obj = self.useFixture(
+            GeneratorFixture('contrail-vrouter-agent-12', collectors,
+                             logging, None, node_type='Compute'))
+        assert generator_obj.verify_on_setup()
+        generator_obj.send_vrouterinfo(socket.gethostname(),
+            b_info = True, deleted = False, non_ascii=True)
+        # Verify vizd is still running
+        assert analytics.verify_collector_gen(analytics.collectors[0])
+    # end test_12_verify_message_non_ascii
+
     @staticmethod
     def get_free_port():
         cs = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

src/opserver/test/utils/generator_fixture.py

@@ -400,16 +400,20 @@ def send_vn_config_uve(self, name, conn_nw=None, partial_conn_nw=None,
         vn_uve.send(sandesh=self._sandesh_instance)
     # end send_vn_config_uve
 
-    def send_vrouterinfo(self, name, b_info = False, deleted = False):
+    def send_vrouterinfo(self, name, b_info = False, deleted = False,
+                         non_ascii = False):
         vinfo = None
 
         if deleted:
             vinfo = VrouterAgent(name=name,
                                  deleted = True)
         else:
             if b_info:
+                build_info="testinfo"
+                if non_ascii:
+                    build_info += ' ' + chr(201) + chr(203) + chr(213) + ' ' + build_info
                 vinfo = VrouterAgent(name=name,
-                                     build_info="testinfo",
+                                     build_info=build_info,
                                      state="OK")
             else:
                 vinfo = VrouterAgent(name=name, state="OK")