Fix OPENDJ-65: Host domain name lost from FQDN while enabling replication f...

Matthew Swift

06.13.2011 381699566181f2854bd83c0f27351aae3e75e6d8

Fix OPENDJ-65: Host domain name lost from FQDN while enabling replication for a new replica using disreplication enable

Fix unit test regression.

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java

@@ -123,12 +123,23 @@
  private static final int DS6_SDL = -1;
  private static SortedSet<String> DS6_RU = new TreeSet<String>();

  private static String LOCAL_HOST_NAME;

  static
  {
    DS2_RU.add("ldap://fake_url_for_ds2");

    DS6_RU.add("ldap://fake_url_for_ds6_A");
    DS6_RU.add("ldap://fake_url_for_ds6_B");

    try
    {
      LOCAL_HOST_NAME = InetAddress.getLocalHost().getHostName();
    }
    catch (UnknownHostException e)
    {
      fail("Unable to resolve local host name", e);
    }
  }

  private int rs1Port = -1;
@@ -399,15 +410,15 @@

    if (rsIdToExclude != RS1_ID)
    {
      replServers.add("localhost:" + rs1Port);
      replServers.add(getHostPort(rs1Port));
    }
    if (rsIdToExclude != RS2_ID)
    {
      replServers.add("localhost:" + rs2Port);
      replServers.add(getHostPort(rs2Port));
    }
    if (rsIdToExclude != RS3_ID)
    {
      replServers.add("localhost:" + rs3Port);
      replServers.add(getHostPort(rs3Port));
    }

    return replServers;
@@ -475,9 +486,9 @@
      switch (dsId)
      {
        case DS1_ID:
          replServers.add("localhost:" + rs1Port);
          replServers.add("localhost:" + rs2Port);
          replServers.add("localhost:" + rs3Port);
          replServers.add(getHostPort(rs1Port));
          replServers.add(getHostPort(rs2Port));
          replServers.add(getHostPort(rs3Port));

          groupId = DS1_GID;
          assuredType = DS1_AT;
@@ -485,9 +496,9 @@
          refUrls = DS1_RU;
          break;
        case DS2_ID:
          replServers.add("localhost:" + rs1Port);
          replServers.add("localhost:" + rs2Port);
          replServers.add("localhost:" + rs3Port);
          replServers.add(getHostPort(rs1Port));
          replServers.add(getHostPort(rs2Port));
          replServers.add(getHostPort(rs3Port));

          groupId = DS2_GID;
          assuredType = DS2_AT;
@@ -495,7 +506,7 @@
          refUrls = DS2_RU;
          break;
        case DS3_ID:
          replServers.add("localhost:" + rs2Port);
          replServers.add(getHostPort(rs2Port));

          groupId = DS3_GID;
          assuredType = DS3_AT;
@@ -503,7 +514,7 @@
          refUrls = DS3_RU;
          break;
        case DS4_ID:
          replServers.add("localhost:" + rs2Port);
          replServers.add(getHostPort(rs2Port));

          groupId = DS4_GID;
          assuredType = DS4_AT;
@@ -511,8 +522,8 @@
          refUrls = DS4_RU;
          break;
        case DS5_ID:
          replServers.add("localhost:" + rs2Port);
          replServers.add("localhost:" + rs3Port);
          replServers.add(getHostPort(rs2Port));
          replServers.add(getHostPort(rs3Port));

          groupId = DS5_GID;
          assuredType = DS5_AT;
@@ -520,8 +531,8 @@
          refUrls = DS5_RU;
          break;
        case DS6_ID:
          replServers.add("localhost:" + rs2Port);
          replServers.add("localhost:" + rs3Port);
          replServers.add(getHostPort(rs2Port));
          replServers.add(getHostPort(rs3Port));

          groupId = DS6_GID;
          assuredType = DS6_AT;
@@ -835,27 +846,19 @@
  {
    int groupId = -1;
    String serverUrl = null;
    String localHostname = null;
    try
    {
      localHostname = InetAddress.getLocalHost().getHostName();
    } catch (UnknownHostException ex)
    {
      fail("Could not get local host name: " + ex.getMessage());
    }
    switch (rsId)
    {
      case RS1_ID:
        groupId = RS1_GID;
        serverUrl = localHostname + ":" + rs1Port;
        serverUrl = getHostPort(rs1Port);
        break;
      case RS2_ID:
        groupId = RS2_GID;
        serverUrl = localHostname + ":" + rs2Port;
        serverUrl = getHostPort(rs2Port);
        break;
      case RS3_ID:
        groupId = RS3_GID;
        serverUrl = localHostname + ":" + rs3Port;
        serverUrl = getHostPort(rs3Port);
        break;
      default:
        fail("Unknown replication server id.");
@@ -1233,4 +1236,11 @@
        "CONNECTED RS SERVERS:\n" + rsStr);
    }
  }



  private String getHostPort(int port)
  {
    return LOCAL_HOST_NAME + ":" + port;
  }
}