Merge pull request #1020 from joyent/ether/switch_peers-unique-results

fix switch_peers validation
joyent · Sep 14, 2020 · 783fb87 · 783fb87
2 parents 1f1b313 + 4339930
commit 783fb87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/Conch/Validation.pm b/lib/Conch/Validation.pm
@@ -535,7 +535,6 @@ sub register_result ($self, %attrs) {
 
     my $validation_result = {
         message  => $attrs{message}  || $message,
-        name     => $attrs{name}     || $self->name,
         category => $attrs{category} || $self->category,
         component    => $attrs{component},
         status       => $success ? _STATUS_PASS : _STATUS_FAIL,

diff --git a/lib/Conch/Validation/SwitchPeers.pm b/lib/Conch/Validation/SwitchPeers.pm
@@ -73,7 +73,7 @@ sub validate {
             expected     => [@peer_ports],
             got          => $peer_port,
             cmp          => 'oneOf',
-            component    => $nic->{nic},
+            component    => $nic->{mac},
             name         => 'peer_ports'
         );
 
@@ -85,7 +85,7 @@ sub validate {
     $self->register_result(
         expected => 2,
         got      => $num_switches,
-        name     => 'num_switches'
+        component => 'num_switches',
     );
 
     # Validate the number of ports per switch
@@ -97,7 +97,6 @@ sub validate {
         $self->register_result(
             expected => 2,
             got      => $num_ports,
-            name     => 'num_ports',
             component => $switch_name,
         );
     }