Merge branch 'pdb_instance_fix' into develop

Author: Marcin Przepiorowski

bin/dx_get_db_env.pl

@@ -564,7 +564,7 @@ =head1 COLUMNS
 
 =item B<Group> - Group name
 
-=item B<Type> - Database type
+=item B<Type> - Database type: dSource | VDB | CDB (Oracle Container) | vCDB ( Oracle Virtual Container )
 
 =item B<SourceDB> - Parent name for VDB
 

bin/dx_get_instance.pl

@@ -122,6 +122,18 @@
       next;
     }
 
+    my $dbname = $dbobj->getName();
+    my $dbtype = $dbobj->getType();
+
+    if (defined($dbobj->getCDBContainerRef())) {
+      # database has a CDB container so it's a PDB and there is no instance info
+      # dbobj will be switch to container to show data
+
+      #my $contsourceconfig = $databases->{_sourceconfigs}->getSourceConfig($dbobj->getCDBContainerRef());
+      #print Dumper $contsourceconfig;
+      my $contsource = $databases->{_source}->getSourceByConfig($dbobj->getCDBContainerRef());
+      $dbobj = $databases->getDB($contsource->{container});
+    }
 
     for my $inst ( @{$dbobj->getInstances()} ) {
       if (defined($instance) && ($inst->{instanceNumber} ne $instance)) {
@@ -136,9 +148,9 @@
         $dbobj->getEnvironmentName(),
         $dbobj->getInstanceHost($inst->{instanceNumber}),
         $groups->getName($dbobj->getGroup()),
-        $dbobj->getName(),
+        $dbname,
         $inst->{instanceName},
-        $dbobj->getType(),
+        $dbtype,
         $dbobj->getInstanceStatus($inst->{instanceNumber})
       );
     }

lib/OracleVDB_obj.pm

@@ -267,6 +267,35 @@ sub getConfig
 
 }
 
+# Procedure getType
+# parameters: none
+# Return database type (dSource / VDB)
+
+sub getType
+{
+    my $self = shift;
+    logger($self->{_debug}, "Entering VDB_obj::getType",1);
+    my $type = $self->{source}->{type};
+
+    if (defined($type)) {
+        if ($type =~ /Linked(.*)Source/ ) {
+            if ($self->{container}->{contentType} eq 'ROOT_CDB') {
+              return "CDB"
+            } else {
+              return "dSource";
+            }
+        } else {
+            if ($self->{container}->{contentType} eq 'ROOT_CDB') {
+              return "vCDB";
+            } else {
+              return "VDB";
+            }
+        }
+    } else {
+        return "detached";
+    }
+}
+
 
 # Procedure getInstances
 # parameters: none