From d74f5f568986eba10721f0f44ee8b81f82c53990 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 1 Feb 2009 00:24:34 +0000
Subject: [PATCH] -Revert accidental checkin

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2691 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 46 ++--------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 4d1052ab9..ced1e8fc0 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -19,8 +19,6 @@ use Storable qw(store_fd retrieve_fd thaw freeze);
 use xCAT::Utils;
 use xCAT::Usage;
 use Thread qw(yield);
-use LWP 5.64;
-use HTTP::Request::Common;
 my $tfactor = 0;
 my $vpdhash;
 my %bmc_comm_pids;
@@ -43,7 +41,6 @@ sub handled_commands {
     rbeacon => 'nodehm:mgt',
     reventlog => 'nodehm:mgt',
     rfrurewrite => 'nodehm:mgt',
-    getrvidparms => 'nodehm:mgt'
   }
 }
 
@@ -73,7 +70,6 @@ my $currnode; #string to describe current node, presumably nodename
 my $globrc=0;
 my $userid;
 my $passwd;
-my $ipmi_bmcipaddr;
 my $timeout;
 my $port;
 my $debug;
@@ -477,11 +473,11 @@ sub ipmicmd {
 		$text = "failed to get IP for $node";
 		return(2,$text);
 	}
-    $ipmi_bmcipaddr=inet_ntoa($packed_ip);
+	my $nodeip = inet_ntoa($packed_ip);
 
 	$sock = IO::Socket::INET->new(
 		Proto => 'udp',
-		PeerHost => $ipmi_bmcipaddr,
+		PeerHost => $nodeip,
 		PeerPort => $port,
 	);
 	if(!defined($sock)) {
@@ -600,9 +596,6 @@ sub ipmicmd {
 	elsif($command eq "rbeacon") {
 		($rc,$text) = beacon($subcommand);
 	}
-	elsif($command eq "getrvidparms") {
-		($rc,@output) = getrvidparms($subcommand);
-	}
 #	elsif($command eq "info") {
 #		if($subcommand eq "sensorname") {
 #			($rc,$text) = initsdr();
@@ -1266,41 +1259,6 @@ sub idpxthermprofile {
 }
 
 
-sub getrvidparms {
-    my $netfun = 0x3a;
-    my @mcinfo=getdevid();
-    unless ($mcinfo[2] == 2) { #Only implemented for IBM servers
-        return(1,"Remote video is not supported on this system");
-    }
-    #TODO: use get bmc capabilities to see if rvid is actually supported before bothering the client java app
-    my @build_id;
-    my $localerror = docmd(
-        0xe8,
-        [0x50],
-        \@build_id
-    );
-    if ($localerror) {
-        return(1,$localerror);
-    }
-    @build_id=splice @build_id,36-$authoffset;
-    unless ($build_id[1]==0x79 and $build_id[2]==0x75 and $build_id[3]==0x6f and $build_id[4]==0x6f) { #Only know how to cope with yuoo builds
-        return(1,"Remote video is not supported on this system");
-    }
-    #wvid should be a possiblity, time to do the http...
-    my $browser = LWP::UserAgent->new();
-    my $message = "$userid,$passwd";
-    $browser->cookie_jar({});
-    my $baseurl = "http://".$ipmi_bmcipaddr."/";
-    my $response = $browser->request(POST $baseurl."/session/create",'Content-Type'=>"text/xml",Content=>$message);
-    unless ($response->content eq "ok") {
-        return (1,"Server returned unexpected data");
-    }
-
-    $response = $browser->request(GET $baseurl."/kvm/kvm/jnlp");
-    return (0,"method:imm","jnlp:".$response->content);
-}
-
-
 sub power {
 	my $subcommand = shift;