feat(mgmt): rename VpcExposeManifest->VpcManifest

Signed-off-by: Fredi Raspall <[email protected]>

Author: Fredi-raspall

mgmt/src/rpc/overlay/mod.rs

@@ -8,7 +8,7 @@ pub mod vpc;
 pub mod vpcpeering;
 
 use crate::rpc::overlay::vpc::VpcTable;
-use crate::rpc::overlay::vpcpeering::VpcExposeManifest;
+use crate::rpc::overlay::vpcpeering::VpcManifest;
 use crate::rpc::overlay::vpcpeering::VpcPeeringTable;
 use tracing::error;
 
@@ -27,7 +27,7 @@ impl Overlay {
             peering_table,
         }
     }
-    fn check_peering_vpc(&self, peering: &str, manifest: &Option<VpcExposeManifest>) -> ApiResult {
+    fn check_peering_vpc(&self, peering: &str, manifest: &Option<VpcManifest>) -> ApiResult {
         if let Some(vpc) = manifest {
             if self.vpc_table.get_vpc(&vpc.name).is_none() {
                 error!("peering '{}': unknown VPC '{}'", peering, vpc.name);

mgmt/src/rpc/overlay/tests.rs

@@ -8,16 +8,16 @@
 pub mod test {
     use crate::rpc::overlay::vpc::{Vpc, VpcTable};
     use crate::rpc::overlay::vpcpeering::VpcExpose;
-    use crate::rpc::overlay::vpcpeering::VpcExposeManifest;
+    use crate::rpc::overlay::vpcpeering::VpcManifest;
     use crate::rpc::overlay::vpcpeering::{VpcPeering, VpcPeeringTable};
     use crate::rpc::overlay::Overlay;
     use crate::rpc::ApiError;
 
     use routing::prefix::Prefix;
 
     /* Build sample manifests for a peering */
-    fn build_manifest_vpc1() -> VpcExposeManifest {
-        let mut vpc1 = VpcExposeManifest::new("VPC-1");
+    fn build_manifest_vpc1() -> VpcManifest {
+        let mut vpc1 = VpcManifest::new("VPC-1");
         let expose = VpcExpose::empty()
             .ip(Prefix::from(("10.0.0.0", 25)))
             .ip(Prefix::from(("10.0.2.128", 25)))
@@ -28,8 +28,8 @@ pub mod test {
         vpc1.add_expose(expose).expect("Should succeed");
         vpc1
     }
-    fn build_manifest_vpc2() -> VpcExposeManifest {
-        let mut vpc1 = VpcExposeManifest::new("VPC-2");
+    fn build_manifest_vpc2() -> VpcManifest {
+        let mut vpc1 = VpcManifest::new("VPC-2");
         let expose = VpcExpose::empty()
             .ip(Prefix::from(("10.0.0.0", 24)))
             .as_range(Prefix::from(("100.64.2.0", 24)));
@@ -146,29 +146,29 @@ pub mod test {
     fn test_peering_iter() {
         let mut peering_table = VpcPeeringTable::new();
 
-        let m1 = VpcExposeManifest::new("VPC-1");
-        let m2 = VpcExposeManifest::new("VPC-2");
+        let m1 = VpcManifest::new("VPC-1");
+        let m2 = VpcManifest::new("VPC-2");
         let mut peering = VpcPeering::new("Peering-1");
         peering.set_one(m1);
         peering.set_two(m2);
         peering_table.add(peering).unwrap();
 
-        let m1 = VpcExposeManifest::new("VPC-1");
-        let m2 = VpcExposeManifest::new("VPC-3");
+        let m1 = VpcManifest::new("VPC-1");
+        let m2 = VpcManifest::new("VPC-3");
         let mut peering = VpcPeering::new("Peering-2");
         peering.set_one(m1);
         peering.set_two(m2);
         peering_table.add(peering).unwrap();
 
-        let m1 = VpcExposeManifest::new("VPC-2");
-        let m2 = VpcExposeManifest::new("VPC-4");
+        let m1 = VpcManifest::new("VPC-2");
+        let m2 = VpcManifest::new("VPC-4");
         let mut peering = VpcPeering::new("Peering-3");
         peering.set_one(m1);
         peering.set_two(m2);
         peering_table.add(peering).unwrap();
 
-        let m1 = VpcExposeManifest::new("VPC-1");
-        let m2 = VpcExposeManifest::new("VPC-4");
+        let m1 = VpcManifest::new("VPC-1");
+        let m2 = VpcManifest::new("VPC-4");
         let mut peering = VpcPeering::new("Peering-4");
         peering.set_one(m1);
         peering.set_two(m2);

mgmt/src/rpc/overlay/vpcpeering.rs

@@ -43,11 +43,11 @@ impl VpcExpose {
 }
 
 #[derive(Debug, Default)]
-pub struct VpcExposeManifest {
+pub struct VpcManifest {
     pub name: String, /* key: name of vpc */
     pub exposes: Vec<VpcExpose>,
 }
-impl VpcExposeManifest {
+impl VpcManifest {
     pub fn new(vpc_name: &str) -> Self {
         Self {
             name: vpc_name.to_owned(),
@@ -64,8 +64,8 @@ impl VpcExposeManifest {
 #[derive(Debug)]
 pub struct VpcPeering {
     pub name: String, /* key: name of peering */
-    pub vpc1: Option<VpcExposeManifest>,
-    pub vpc2: Option<VpcExposeManifest>,
+    pub vpc1: Option<VpcManifest>,
+    pub vpc2: Option<VpcManifest>,
 }
 impl VpcPeering {
     pub fn new(name: &str) -> Self {
@@ -85,10 +85,10 @@ impl VpcPeering {
             Ok(())
         }
     }
-    pub fn set_one(&mut self, exp_manifest: VpcExposeManifest) {
+    pub fn set_one(&mut self, exp_manifest: VpcManifest) {
         self.vpc1 = Some(exp_manifest);
     }
-    pub fn set_two(&mut self, exp_manifest: VpcExposeManifest) {
+    pub fn set_two(&mut self, exp_manifest: VpcManifest) {
         self.vpc2 = Some(exp_manifest);
     }