https://issues.apache.org/jira/browse/JCLOUDS-1122 https://issues.apache.org/jira/browse/JCLOUDS-1300
This PR supersedes https://github.com/jclouds/jclouds/pull/1006. It includes the commit from the original PR, adds the missing tests, and changes several methods on the NetworkApi to make ti explicit whether legacy or a custom mode networks are created. With this PR, the `TempalteOptions.networks` accepts a legacy network or a subnet. Note this includes backwards-incompatible changes, so this should not be backported to 2.0.x. @felfert @utkarsh-devops Could you give this branch a try in the Jenkins plugin? You can view, comment on, or merge this pull request online at: https://github.com/jclouds/jclouds/pull/1106 -- Commit Summary -- * JCLOUDS-1122: Support subnetworks definitions in Google Compute. * JCLOUDS-1300: Subnetwork fixes and reuse the TemplateOptions.networks -- File Changes -- M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java (9) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java (53) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java (16) A providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/domain/internal/RegionAndName.java (53) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/Resources.java (5) A providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/SubnetworkLoader.java (53) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java (1) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java (77) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java (2) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java (28) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/NewInstance.java (34) A providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Subnetwork.java (61) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AggregatedListApi.java (50) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java (30) A providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SubnetworkApi.java (128) M providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/NetworkCreationOptions.java (29) A providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/SubnetworkCreationOptions.java (55) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceMockTest.java (56) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/ResourcesMockTest.java (18) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java (3) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java (9) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiMockTest.java (4) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiWindowsLiveTest.java (45) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java (2) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiMockTest.java (12) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RouteApiLiveTest.java (3) A providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SubnetworkApiLiveTest.java (80) A providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SubnetworkApiMockTest.java (96) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java (5) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java (8) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java (13) M providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java (5) A providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java (51) A providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java (56) A providers/google-compute-engine/src/test/resources/firewall_insert_3.json (28) A providers/google-compute-engine/src/test/resources/instance_insert_subnet.json (46) M providers/google-compute-engine/src/test/resources/network_get.json (3) M providers/google-compute-engine/src/test/resources/network_insert.json (2) A providers/google-compute-engine/src/test/resources/network_insert_custom.json (1) A providers/google-compute-engine/src/test/resources/subnetwork_get.json (12) A providers/google-compute-engine/src/test/resources/subnetwork_insert.json (8) A providers/google-compute-engine/src/test/resources/subnetwork_list.json (19) -- Patch Links -- https://github.com/jclouds/jclouds/pull/1106.patch https://github.com/jclouds/jclouds/pull/1106.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/1106
