Projects >> serengeti-ws >>fc3f9b15bfbcc46d865811e2ab86761b43cb17ab

Chunk
Conflicting content
        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/clusters", HttpMethod.POST,
                HttpStatus.NO_CONTENT, "");

<<<<<<< HEAD
        clusterCommands.createCluster("cluster1", null, "samples/cluster_hadoop.spec", null, null, null, false, false, false);
=======
        clusterCommands.createCluster("cluster1", null, "HADOOP", "hadoop_cluster.json", null, null, null, false, false, false);
    }

    @Test
    public void testCreateHbaseClusterBySpecFile() throws Exception {
        NetworkRead[] networks = new NetworkRead[1];
        NetworkRead network = new NetworkRead();
        network.setName("dhcp");
        network.setDhcp(true);
        network.setPortGroup("pg1");
        networks[0] = network;

        ObjectMapper mapper = new ObjectMapper();
        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/networks", HttpMethod.GET, HttpStatus.OK,
                mapper.writeValueAsString(networks));

        DistroRead distro = new DistroRead();
        distro.setName(Constants.DEFAULT_DISTRO);
        List roles = new ArrayList();
        roles.add("hadoop");
        roles.add("hadoop_namenode");
        roles.add("hadoop_jobtracker");
        roles.add("hbase_master");
        roles.add("hadoop_worker");
        roles.add("hadoop_datanode");
        roles.add("hadoop_tasktracker");
        roles.add("hbase_regionserver");
        roles.add("hadoop_client");
        roles.add("hive");
        roles.add("hive_server");
        roles.add("pig");
        roles.add("hbase_client");
        roles.add("zookeeper");
        distro.setRoles(roles);

        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/distro/" + Constants.DEFAULT_DISTRO,
                HttpMethod.GET, HttpStatus.OK, mapper.writeValueAsString(distro));

        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/clusters", HttpMethod.POST,
                HttpStatus.NO_CONTENT, "");

        clusterCommands.createCluster("cluster1", null, "HADOOP", "hadoop_cluster.json", null, null, null, false, false, false);
>>>>>>> 6e5e622eb76aa21a33a4d8efbe28c40fe4678569
    }

    @Test
Solution content
        networks[0] = network;

        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/clusters", HttpMethod.POST,
                HttpStatus.NO_CONTENT, "");

        clusterCommands.createCluster("cluster1", null, "hadoop_cluster.json", null, null, null, false, false, false);
    }

    @Test
    public void testCreateHbaseClusterBySpecFile() throws Exception {
        NetworkRead[] networks = new NetworkRead[1];
        NetworkRead network = new NetworkRead();
        network.setName("dhcp");
        network.setDhcp(true);
        network.setPortGroup("pg1");
        ObjectMapper mapper = new ObjectMapper();
        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/networks", HttpMethod.GET, HttpStatus.OK,
                mapper.writeValueAsString(networks));

        DistroRead distro = new DistroRead();
        distro.setName(Constants.DEFAULT_DISTRO);
        List roles = new ArrayList();
        roles.add("hadoop");
        roles.add("hadoop_namenode");
        roles.add("hadoop_jobtracker");
        roles.add("hbase_master");
        roles.add("hadoop_worker");
        roles.add("hadoop_datanode");
        roles.add("hadoop_tasktracker");
        roles.add("hbase_regionserver");
        roles.add("hadoop_client");
        roles.add("hive");
        roles.add("hive_server");
        roles.add("pig");
        roles.add("hbase_client");
        roles.add("zookeeper");
        distro.setRoles(roles);

        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/distro/" + Constants.DEFAULT_DISTRO,
                HttpMethod.GET, HttpStatus.OK, mapper.writeValueAsString(distro));

        buildReqRespWithoutReqBody("http://127.0.0.1:8080/serengeti/api/clusters", HttpMethod.POST,
                HttpStatus.NO_CONTENT, "");

        clusterCommands.createCluster("cluster1", null, "hadoop_cluster.json", null, null, null, false, false, false);
    }

    @Test
File
ClusterCommandsTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Array access
Method invocation
Method signature
Variable