Issue 1022:Move naming convention to Api from Client or Services:: carrenza-vcloud-director

labs/carrenza-vcloud-director/src/main/java/org/jclouds/carrenza/vcloud/director/CarrenzaVCloudDirectorProviderMetadata.java

@@ -94,4 +94,4 @@ public class CarrenzaVCloudDirectorProviderMetadata extends BaseProviderMetadata
          return this;
       }
    }
-}
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorComputeServiceLiveTest.java

@@ -33,4 +33,4 @@ public class CarrenzaVCloudDirectorComputeServiceLiveTest { // FIXME: enable whe
 //   public CarrenzaVCloudDirectorComputeServiceLiveTest() {
 //      provider = "carrenza-vcloud-director";
 //   }
-}
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/compute/CarrenzaVCloudDirectorTemplateBuilderLiveTest.java

@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
  */
 @Test(groups = { "live", "compute" }, testName = "CarrenzaVCloudDirectorTemplateBuilderLiveTest")
 public class CarrenzaVCloudDirectorTemplateBuilderLiveTest {
-//      BaseTemplateBuilderLiveTest<VCloudDirectorClient, VCloudDirectorAsyncClient, VCloudDirectorContext> {
+//      BaseTemplateBuilderLiveTest<VCloudDirectorApi, VCloudDirectorAsyncApi, VCloudDirectorContext> {
 //
 //   public CarrenzaVCloudDirectorTemplateBuilderLiveTest() {
 //      provider = "carrenza-vcloud-director";

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorCatalogApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features;
 
-import org.jclouds.vcloud.director.v1_5.features.VAppClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.CatalogApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppClientLiveTest")
-public class CarrenzaVCloudDirectorVAppClientLiveTest extends VAppClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorCatalogApiLiveTest")
+public class CarrenzaVCloudDirectorCatalogApiLiveTest extends CatalogApiLiveTest {
 
-   public CarrenzaVCloudDirectorVAppClientLiveTest() {
+   public CarrenzaVCloudDirectorCatalogApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features;
 
-import org.jclouds.vcloud.director.v1_5.features.OrgClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.MediaApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
-public class CarrenzaVCloudDirectorOrgClientLiveTest extends OrgClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorMediaApiLiveTest")
+public class CarrenzaVCloudDirectorMediaApiLiveTest extends MediaApiLiveTest {
 
-   public CarrenzaVCloudDirectorOrgClientLiveTest() {
+   public CarrenzaVCloudDirectorMediaApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorMediaClientLiveTest.java

@@ -1,36 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.carrenza.vcloud.director.features;
-
-import org.jclouds.vcloud.director.v1_5.features.MediaClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * {@inheritDoc}
- * 
- * @author danikov
- * @author grkvlt
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorMediaClientLiveTest")
-public class CarrenzaVCloudDirectorMediaClientLiveTest extends MediaClientLiveTest {
-
-   public CarrenzaVCloudDirectorMediaClientLiveTest() {
-      provider = "carrenza-vcloud-director";
-   }
-}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features;
 
-import org.jclouds.vcloud.director.v1_5.features.TaskClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.NetworkApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorTaskClientLiveTest")
-public class CarrenzaVCloudDirectorTaskClientLiveTest extends TaskClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorNetworkApiLiveTest")
+public class CarrenzaVCloudDirectorNetworkApiLiveTest extends NetworkApiLiveTest {
 
-   public CarrenzaVCloudDirectorTaskClientLiveTest() {
+   public CarrenzaVCloudDirectorNetworkApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorNetworkClientLiveTest.java

@@ -1,36 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.carrenza.vcloud.director.features;
-
-import org.jclouds.vcloud.director.v1_5.features.NetworkClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * {@inheritDoc}
- * 
- * @author danikov
- * @author grkvlt
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorNetworkClientLiveTest")
-public class CarrenzaVCloudDirectorNetworkClientLiveTest extends NetworkClientLiveTest {
-
-   public CarrenzaVCloudDirectorNetworkClientLiveTest() {
-      provider = "carrenza-vcloud-director";
-   }
-}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorOrgApiLiveTest.java

@@ -0,0 +1,36 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.carrenza.vcloud.director.features;
+
+import org.jclouds.vcloud.director.v1_5.features.OrgApiLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * {@inheritDoc}
+ * 
+ * @author danikov
+ * @author grkvlt
+ */
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgApiLiveTest")
+public class CarrenzaVCloudDirectorOrgApiLiveTest extends OrgApiLiveTest {
+
+   public CarrenzaVCloudDirectorOrgApiLiveTest() {
+      provider = "carrenza-vcloud-director";
+   }
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryApiLiveTest.java

@@ -0,0 +1,36 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.carrenza.vcloud.director.features;
+
+import org.jclouds.vcloud.director.v1_5.features.QueryApiLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * {@inheritDoc}
+ * 
+ * @author danikov
+ * @author grkvlt
+ */
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorQueryApiLiveTest")
+public class CarrenzaVCloudDirectorQueryApiLiveTest extends QueryApiLiveTest {
+
+   public CarrenzaVCloudDirectorQueryApiLiveTest() {
+      provider = "carrenza-vcloud-director";
+   }
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorQueryClientLiveTest.java

@@ -1,36 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.carrenza.vcloud.director.features;
-
-import org.jclouds.vcloud.director.v1_5.features.QueryClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * {@inheritDoc}
- * 
- * @author danikov
- * @author grkvlt
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorQueryClientLiveTest")
-public class CarrenzaVCloudDirectorQueryClientLiveTest extends QueryClientLiveTest {
-
-   public CarrenzaVCloudDirectorQueryClientLiveTest() {
-      provider = "carrenza-vcloud-director";
-   }
-}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorTaskApiLiveTest.java

@@ -0,0 +1,36 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.carrenza.vcloud.director.features;
+
+import org.jclouds.vcloud.director.v1_5.features.TaskApiLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * {@inheritDoc}
+ * 
+ * @author danikov
+ * @author grkvlt
+ */
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorTaskApiLiveTest")
+public class CarrenzaVCloudDirectorTaskApiLiveTest extends TaskApiLiveTest {
+
+   public CarrenzaVCloudDirectorTaskApiLiveTest() {
+      provider = "carrenza-vcloud-director";
+   }
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features;
 
-import org.jclouds.vcloud.director.v1_5.features.VdcClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.UploadApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVDCClientLiveTest")
-public class CarrenzaVCloudDirectorVdcClientLiveTest extends VdcClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUploadApiLiveTest")
+public class CarrenzaVCloudDirectorUploadApiLiveTest extends UploadApiLiveTest {
 
-   public CarrenzaVCloudDirectorVdcClientLiveTest() {
+   public CarrenzaVCloudDirectorUploadApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorUploadClientLiveTest.java

@@ -1,36 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.carrenza.vcloud.director.features;
-
-import org.jclouds.vcloud.director.v1_5.features.UploadClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * {@inheritDoc}
- * 
- * @author danikov
- * @author grkvlt
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUploadClientLiveTest")
-public class CarrenzaVCloudDirectorUploadClientLiveTest extends UploadClientLiveTest {
-
-   public CarrenzaVCloudDirectorUploadClientLiveTest() {
-      provider = "carrenza-vcloud-director";
-   }
-}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppApiLiveTest.java

@@ -0,0 +1,36 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.carrenza.vcloud.director.features;
+
+import org.jclouds.vcloud.director.v1_5.features.VAppApiLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * {@inheritDoc}
+ * 
+ * @author danikov
+ * @author grkvlt
+ */
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppApiLiveTest")
+public class CarrenzaVCloudDirectorVAppApiLiveTest extends VAppApiLiveTest {
+
+   public CarrenzaVCloudDirectorVAppApiLiveTest() {
+      provider = "carrenza-vcloud-director";
+   }
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features;
 
-import org.jclouds.vcloud.director.v1_5.features.CatalogClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorCatalogClientLiveTest")
-public class CarrenzaVCloudDirectorCatalogClientLiveTest extends CatalogClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppTemplateApiLiveTest")
+public class CarrenzaVCloudDirectorVAppTemplateApiLiveTest extends VAppTemplateApiLiveTest {
 
-   public CarrenzaVCloudDirectorCatalogClientLiveTest() {
+   public CarrenzaVCloudDirectorVAppTemplateApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVAppTemplateClientLiveTest.java

@@ -1,36 +0,0 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.jclouds.carrenza.vcloud.director.features;
-
-import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClientLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * {@inheritDoc}
- * 
- * @author danikov
- * @author grkvlt
- */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVAppTemplateClientLiveTest")
-public class CarrenzaVCloudDirectorVAppTemplateClientLiveTest extends VAppTemplateClientLiveTest {
-
-   public CarrenzaVCloudDirectorVAppTemplateClientLiveTest() {
-      provider = "carrenza-vcloud-director";
-   }
-}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/CarrenzaVCloudDirectorVdcApiLiveTest.java

@@ -0,0 +1,36 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.carrenza.vcloud.director.features;
+
+import org.jclouds.vcloud.director.v1_5.features.VdcApiLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * {@inheritDoc}
+ * 
+ * @author danikov
+ * @author grkvlt
+ */
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorVDCApiLiveTest")
+public class CarrenzaVCloudDirectorVdcApiLiveTest extends VdcApiLiveTest {
+
+   public CarrenzaVCloudDirectorVdcApiLiveTest() {
+      provider = "carrenza-vcloud-director";
+   }
+}

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminCatalogApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminCatalogClientLiveTest")
-public class CarrenzaVCloudDirectorAdminCatalogClientLiveTest extends AdminCatalogClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminCatalogApiLiveTest")
+public class CarrenzaVCloudDirectorAdminCatalogApiLiveTest extends AdminCatalogApiLiveTest {
 
-   public CarrenzaVCloudDirectorAdminCatalogClientLiveTest() {
+   public CarrenzaVCloudDirectorAdminCatalogApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminNetworkApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminNetworkClientLiveTest")
-public class CarrenzaVCloudDirectorAdminNetworkClientLiveTest extends AdminNetworkClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminNetworkApiLiveTest")
+public class CarrenzaVCloudDirectorAdminNetworkApiLiveTest extends AdminNetworkApiLiveTest {
 
-   public CarrenzaVCloudDirectorAdminNetworkClientLiveTest() {
+   public CarrenzaVCloudDirectorAdminNetworkApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminOrgApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.UserClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUserClientLiveTest")
-public class CarrenzaVCloudDirectorUserClientLiveTest extends UserClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgApiLiveTest")
+public class CarrenzaVCloudDirectorAdminOrgApiLiveTest extends AdminOrgApiLiveTest {
 
-   public CarrenzaVCloudDirectorUserClientLiveTest() {
+   public CarrenzaVCloudDirectorAdminOrgApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminQueryApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminQueryClientLiveTest")
-public class CarrenzaVCloudDirectorAdminQueryClientLiveTest extends AdminQueryClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminQueryApiLiveTest")
+public class CarrenzaVCloudDirectorAdminQueryApiLiveTest extends AdminQueryApiLiveTest {
 
-   public CarrenzaVCloudDirectorAdminQueryClientLiveTest() {
+   public CarrenzaVCloudDirectorAdminQueryApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorAdminVdcApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.GroupClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorGroupClientLiveTest")
-public class CarrenzaVCloudDirectorGroupClientLiveTest extends GroupClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminVdcApiLiveTest")
+public class CarrenzaVCloudDirectorAdminVdcApiLiveTest extends AdminVdcApiLiveTest {
 
-   public CarrenzaVCloudDirectorGroupClientLiveTest() {
+   public CarrenzaVCloudDirectorAdminVdcApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorGroupApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.GroupApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorOrgClientLiveTest")
-public class CarrenzaVCloudDirectorAdminOrgClientLiveTest extends AdminOrgClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorGroupApiLiveTest")
+public class CarrenzaVCloudDirectorGroupApiLiveTest extends GroupApiLiveTest {
 
-   public CarrenzaVCloudDirectorAdminOrgClientLiveTest() {
+   public CarrenzaVCloudDirectorGroupApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/features/admin/CarrenzaVCloudDirectorUserApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.features.admin;
 
-import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.features.admin.UserApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorAdminVdcClientLiveTest")
-public class CarrenzaVCloudDirectorAdminVdcClientLiveTest extends AdminVdcClientLiveTest {
+@Test(groups = { "live", "admin" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorUserApiLiveTest")
+public class CarrenzaVCloudDirectorUserApiLiveTest extends UserApiLiveTest {
 
-   public CarrenzaVCloudDirectorAdminVdcClientLiveTest() {
+   public CarrenzaVCloudDirectorUserApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }

labs/carrenza-vcloud-director/src/test/java/org/jclouds/carrenza/vcloud/director/login/CarrenzaVCloudDirectorSessionApiLiveTest.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.carrenza.vcloud.director.login;
 
-import org.jclouds.vcloud.director.v1_5.login.SessionClientLiveTest;
+import org.jclouds.vcloud.director.v1_5.login.SessionApiLiveTest;
 import org.testng.annotations.Test;
 
 /**
@@ -27,10 +27,10 @@ import org.testng.annotations.Test;
  * @author danikov
  * @author grkvlt
  */
-@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorSessionClientLiveTest")
-public class CarrenzaVCloudDirectorSessionClientLiveTest extends SessionClientLiveTest {
+@Test(groups = { "live", "user" }, singleThreaded = true, testName = "CarrenzaVCloudDirectorSessionApiLiveTest")
+public class CarrenzaVCloudDirectorSessionApiLiveTest extends SessionApiLiveTest {
 
-   public CarrenzaVCloudDirectorSessionClientLiveTest() {
+   public CarrenzaVCloudDirectorSessionApiLiveTest() {
       provider = "carrenza-vcloud-director";
    }
 }