Skip to content

Commit

Permalink
Merge "Strip white-spaces in UT Xmpp messages"
Browse files Browse the repository at this point in the history
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Oct 12, 2016
2 parents 1cfc80a + 3e4df94 commit 2028673
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 104 deletions.
98 changes: 42 additions & 56 deletions src/vnsw/agent/pkt/test/test_flow_base.cc
View file
Expand Up @@ -339,50 +339,46 @@ class FlowTest : public ::testing::Test {
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <virtual-network> any </virtual-network>\n"
" <virtual-network>any</virtual-network>\n"
" </src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <virtual-network> any </virtual-network>\n"
" <virtual-network>any</virtual-network>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" </action-list>\n"
" <rule-uuid>%s</rule-uuid>\n"
" </acl-rule>\n"
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </src-address>\n"
" <protocol>any</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" deny\n"
" </simple-action>\n"
" <simple-action>deny</simple-action>\n"
" </action-list>\n"
" <rule-uuid>fe6a4dcb-dde4-48e6-8957-856a7aacb2e1</rule-uuid>\n"
" </acl-rule>\n"
Expand Down Expand Up @@ -431,49 +427,43 @@ class FlowTest : public ::testing::Test {
" <dynamic>false</dynamic>\n"
" <acl-rule>\n"
" <match-condition>\n"
" <src-address> %s \n"
" </src-address>\n"
" <src-address>%s</src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address> %s \n"
" </dst-address>\n"
" <dst-address>%s</dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" </action-list>\n"
" <rule-uuid>%s</rule-uuid>\n"
" </acl-rule>\n"
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </src-address>\n"
" <protocol>any</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" deny\n"
" </simple-action>\n"
" <simple-action>deny</simple-action>\n"
" </action-list>\n"
" <rule-uuid>\n"
" fe6a4dcb-dde4-48e6-8957-856a7aacb2e1\n"
Expand Down Expand Up @@ -528,51 +518,47 @@ class FlowTest : public ::testing::Test {
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <virtual-network> any </virtual-network>\n"
" <virtual-network>any</virtual-network>\n"
" </src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <virtual-network> any </virtual-network>\n"
" <virtual-network>any</virtual-network>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" <log>%s</log>\n"
" </action-list>\n"
" <rule-uuid>%s</rule-uuid>\n"
" </acl-rule>\n"
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </src-address>\n"
" <protocol>any</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <virtual-network> vn6 </virtual-network>\n"
" <virtual-network>vn6</virtual-network>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 60000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>60000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" deny\n"
" </simple-action>\n"
" <simple-action>deny</simple-action>\n"
" </action-list>\n"
" <rule-uuid>fe6a4dcb-dde4-48e6-8957-856a7aacb2e1</rule-uuid>\n"
" </acl-rule>\n"
Expand Down
45 changes: 20 additions & 25 deletions src/vnsw/agent/pkt/test/test_sg_flowv6.cc
View file
Expand Up @@ -72,8 +72,8 @@ static string AddAclXmlString(const char *node_name, const char *name, int id,
" </src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <subnet>\n"
Expand All @@ -82,14 +82,12 @@ static string AddAclXmlString(const char *node_name, const char *name, int id,
" </subnet>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" </action-list>\n"
" </acl-rule>\n"
" </access-control-list-entries>\n"
Expand All @@ -114,6 +112,7 @@ static void AddAclEntry(const char *name, int id, int proto,
std::string s = AddAclXmlString("access-control-list", acl_name, id, proto,
action, sip, dip);
pugi::xml_document xdoc_;
cout << s << endl;
pugi::xml_parse_result result = xdoc_.load(s.c_str());
EXPECT_TRUE(result);
Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0);
Expand Down Expand Up @@ -147,51 +146,47 @@ static string AddSgIdAclXmlString(const char *node_name, const char *name, int i
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <security-group> %d </security-group>\n"
" <security-group>%d</security-group>\n"
" </src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <security-group> %d </security-group>\n"
" <security-group>%d</security-group>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" <ethertype>IPv6</ethertype>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" </action-list>\n"
" </acl-rule>\n"
" <acl-rule>\n"
" <match-condition>\n"
" <src-address>\n"
" <security-group> %d </security-group>\n"
" <security-group>%d</security-group>\n"
" </src-address>\n"
" <protocol>%d</protocol>\n"
" <src-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </src-port>\n"
" <dst-address>\n"
" <security-group> %d </security-group>\n"
" <security-group>%d</security-group>\n"
" </dst-address>\n"
" <dst-port>\n"
" <start-port> 0 </start-port>\n"
" <end-port> 10000 </end-port>\n"
" <start-port>0</start-port>\n"
" <end-port>10000</end-port>\n"
" </dst-port>\n"
" <ethertype>IPv6</ethertype>\n"
" </match-condition>\n"
" <action-list>\n"
" <simple-action>\n"
" %s\n"
" </simple-action>\n"
" <simple-action>%s</simple-action>\n"
" </action-list>\n"
" </acl-rule>\n"
" </access-control-list-entries>\n"
Expand Down

0 comments on commit 2028673

Please sign in to comment.