Remove ignition (#1301)

Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
gazebosim · Aug 4, 2023 · af88891 · af88891
1 parent 91876e7
commit af88891
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/python/test/pyModel_TEST.py b/python/test/pyModel_TEST.py
@@ -255,7 +255,7 @@ def test_add_modify_frame(self):
 
     def test_uri(self):
         model = Model()
-        uri = "https:#fuel.ignitionrobotics.org/1.0/openrobotics/models/my-model"
+        uri = "https:#fuel.gazebosim.org/1.0/openrobotics/models/my-model"
 
         model.set_uri(uri)
         self.assertEqual(uri, model.uri())

diff --git a/src/Model_TEST.cc b/src/Model_TEST.cc
@@ -445,7 +445,7 @@ TEST(DOMModel, Uri)
   std::string name = "my-model";
   gz::math::Pose3d pose(1, 2, 3, 0.1, 0.2, 0.3);
   std::string uri =
-    "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/my-model";
+    "https://fuel.gazebosim.org/1.0/openrobotics/models/my-model";
 
   model.SetName(name);
   model.SetRawPose(pose);

diff --git a/test/integration/geometry_dom.cc b/test/integration/geometry_dom.cc
@@ -179,7 +179,7 @@ TEST(DOMGeometry, Shapes)
   EXPECT_EQ(sdf::GeometryType::MESH, meshCol->Geom()->Type());
   const sdf::Mesh *meshColGeom = meshCol->Geom()->MeshShape();
   ASSERT_NE(nullptr, meshColGeom);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/"
       "mesh.dae", meshColGeom->Uri());
   EXPECT_TRUE(gz::math::Vector3d(0.1, 0.2, 0.3) ==
       meshColGeom->Scale());
@@ -193,7 +193,7 @@ TEST(DOMGeometry, Shapes)
   EXPECT_EQ(sdf::GeometryType::MESH, meshVis->Geom()->Type());
   const sdf::Mesh *meshVisGeom = meshVis->Geom()->MeshShape();
   ASSERT_NE(nullptr, meshVisGeom);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh"
       "/mesh.dae", meshVisGeom->Uri());
   EXPECT_TRUE(gz::math::Vector3d(1.2, 2.3, 3.4) ==
       meshVisGeom->Scale());
@@ -207,7 +207,7 @@ TEST(DOMGeometry, Shapes)
   EXPECT_EQ(sdf::GeometryType::HEIGHTMAP, heightmapCol->Geom()->Type());
   auto heightmapColGeom = heightmapCol->Geom()->HeightmapShape();
   ASSERT_NE(nullptr, heightmapColGeom);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/heightmap.png", heightmapColGeom->Uri());
   EXPECT_EQ(gz::math::Vector3d(500, 500, 100), heightmapColGeom->Size());
   EXPECT_EQ(gz::math::Vector3d(1, 2, 3), heightmapColGeom->Position());
@@ -221,31 +221,31 @@ TEST(DOMGeometry, Shapes)
   EXPECT_EQ(sdf::GeometryType::HEIGHTMAP, heightmapVis->Geom()->Type());
   auto heightmapVisGeom = heightmapVis->Geom()->HeightmapShape();
   ASSERT_NE(nullptr, heightmapVisGeom);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/heightmap.png", heightmapVisGeom->Uri());
   EXPECT_EQ(gz::math::Vector3d(500, 500, 100), heightmapVisGeom->Size());
   EXPECT_EQ(gz::math::Vector3d(1, 2, 3), heightmapVisGeom->Position());
   EXPECT_EQ(3u, heightmapVisGeom->TextureCount());
   EXPECT_EQ(2u, heightmapVisGeom->BlendCount());
 
   auto texture0 = heightmapVisGeom->TextureByIndex(0u);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/diffuse0.png", texture0->Diffuse());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/normal0.png", texture0->Normal());
   EXPECT_DOUBLE_EQ(5.0, texture0->Size());
 
   auto texture1 = heightmapVisGeom->TextureByIndex(1u);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/diffuse1.png", texture1->Diffuse());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/normal1.png", texture1->Normal());
   EXPECT_DOUBLE_EQ(10.0, texture1->Size());
 
   auto texture2 = heightmapVisGeom->TextureByIndex(2u);
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/diffuse2.png", texture2->Diffuse());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/"
+  EXPECT_EQ("https://fuel.gazebosim.org/1.0/an_org/models/a_model/"
       "materials/textures/normal2.png", texture2->Normal());
   EXPECT_DOUBLE_EQ(20.0, texture2->Size());
 

diff --git a/test/integration/resolve_uris.cc b/test/integration/resolve_uris.cc
@@ -33,21 +33,21 @@
 constexpr const int kNumCallbacks = 13;
 
 constexpr const char* kMeshUri =
-  "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae";
+  "https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae";
 
 constexpr const char* kHeightmapUri =
-  "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png";  // NOLINT
+  "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png";  // NOLINT
 
 constexpr const char* kCubemapUri = "dummyUri";
 
 constexpr const char* kMaterialScriptUri =
   "file://media/materials/scripts/gazebo.material";
 
 constexpr const char* kDiffuseUri =
-  "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png";  // NOLINT
+  "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png";  // NOLINT
 
 constexpr const char* kNormalUri =
-  "https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal0.png";  // NOLINT
+  "https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal0.png";  // NOLINT
 
 /////////////////////////////////////////////////
 TEST(ResolveURIs, StoreResolvedDisabled)

diff --git a/test/sdf/shapes.sdf b/test/sdf/shapes.sdf
@@ -121,7 +121,7 @@
       <collision name="mesh_col">
         <geometry>
           <mesh>
-            <uri>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae</uri>
+            <uri>https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae</uri>
             <submesh>
               <name>my_submesh</name>
               <center>true</center>
@@ -134,7 +134,7 @@
       <visual name="mesh_vis">
         <geometry>
           <mesh>
-            <uri>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/mesh/mesh.dae</uri>
+            <uri>https://fuel.gazebosim.org/1.0/an_org/models/a_model/mesh/mesh.dae</uri>
             <submesh>
               <name>another_submesh</name>
               <center>false</center>
@@ -147,7 +147,7 @@
       <collision name="heightmap_col">
         <geometry>
           <heightmap>
-            <uri>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png</uri>
+            <uri>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png</uri>
             <size>500 500 100</size>
             <pos>1 2 3</pos>
           </heightmap>
@@ -157,30 +157,30 @@
       <visual name="heightmap_vis">
         <geometry>
           <heightmap>
-            <uri>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/heightmap.png</uri>
+            <uri>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/heightmap.png</uri>
             <size>500 500 100</size>
             <pos>1 2 3</pos>
             <texture>
-              <diffuse>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png</diffuse>
-              <normal>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal0.png</normal>
+              <diffuse>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse0.png</diffuse>
+              <normal>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal0.png</normal>
               <size>5</size>
             </texture>
             <blend>
               <min_height>15</min_height>
               <fade_dist>5</fade_dist>
             </blend>
             <texture>
-              <diffuse>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse1.png</diffuse>
-              <normal>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal1.png</normal>
+              <diffuse>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse1.png</diffuse>
+              <normal>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal1.png</normal>
               <size>10</size>
             </texture>
             <blend>
               <min_height>30</min_height>
               <fade_dist>10</fade_dist>
             </blend>
             <texture>
-              <diffuse>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/diffuse2.png</diffuse>
-              <normal>https://fuel.ignitionrobotics.org/1.0/an_org/models/a_model/materials/textures/normal2.png</normal>
+              <diffuse>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/diffuse2.png</diffuse>
+              <normal>https://fuel.gazebosim.org/1.0/an_org/models/a_model/materials/textures/normal2.png</normal>
               <size>20</size>
             </texture>
           </heightmap>

diff --git a/test/sdf/shapes_world.sdf b/test/sdf/shapes_world.sdf
@@ -123,7 +123,7 @@
         <collision name="collision">
           <geometry>
             <mesh>
-              <uri>https://ignitionfuel.org/an_org/models/a_model/mesh/mesh.dae</uri>
+              <uri>https://fuel.gazebosim.org/an_org/models/a_model/mesh/mesh.dae</uri>
               <submesh>
                 <name>my_submesh</name>
                 <center>true</center>
@@ -136,7 +136,7 @@
         <visual name="visual">
           <geometry>
             <mesh>
-              <uri>https://ignitionfuel.org/an_org/models/a_model/mesh/mesh.dae</uri>
+              <uri>https://fuel.gazebosim.org/an_org/models/a_model/mesh/mesh.dae</uri>
               <submesh>
                 <name>another_submesh</name>
                 <center>false</center>